new logo

author: Leif Johansson <leifj@sunet.se> 2016-04-13 11:02:26 +0200
committer: Leif Johansson <leifj@sunet.se> 2016-04-13 11:02:26 +0200
commit: 01e1987f6a58b2a53eca633eb7a357358258a72a (patch)
tree: f4e16536264e1b4f00bf03db70ceababf3238e68
parent: 52c2e3290d385c31b0e5055db63915c36f8c23b7 (diff)
parent: 074d805f823eb30e87343af7c7c3ede4061b9e8f (diff)
495 files changed, 12702 insertions, 6796 deletions
diff --git a/HEADER.html b/HEADER.html
index e8649661..082d6123 100644
--- a/HEADER.html
+++ b/HEADER.html
@@ -1,20 +1,38 @@
-<style>
-   #container { width: 800; }
-</style>
-<div id="container">
-<img src="sunet-swamid.png">
-<h1>NOTE WELL</h1>
-<p>The contents of this directory is explained in detail at <a href="http://www.swamid.se">www.swamid.se</a>. In order to use any of these files you must either be a member of SWAMID or accept the <a href="swamid-tou-sv.txt">SWAMID Metadata Terms of Use</a>(<a href="swamid-tou-en.txt">en</a>).</p>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <title>Bootstrap 101 Template</title>
+
+    <!-- Bootstrap -->
+    <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <style>
+        .logo {
+           width: 25%;
+        }
+    </style>
+  </head>
+  <body>
+    <div class="container">
+       <div class="page-header">
+          <img class="logo" src="swamid-logo-3.png">
+       </div>
+       <div class="alert alert-info">
+          <p><i class="glyphicon glyphicon-exclamation-sign"></i>&nbsp;<strong>Note Well</strong>&nbsp;The contents of this directory is explained in detail at <a class="alert-link" href="http://www.swamid.se">www.swamid.se</a>. In order to use any of these files you must either be a member of SWAMID or accept the <a class="alert-link" href="swamid-tou-sv.txt">SWAMID Metadata Terms of Use</a>(<a class="alert-link" href="swamid-tou-en.txt">en</a>).</p>
+       </div>
 
 <h2>Signing Key</h2>
 
-<p>SWAMID metadata is signed with the key found in <a href="md-signer.crt">md-signer.crt</a> which has SHA1 fingerprint 12:60:D7:09:6A:D9:C1:43:AD:31:88:14:3C:A8:C4:B7:33:8A:4F:CB</p>
+<p>SWAMID metadata is signed with the key found in <a href="md-signer.crt">md-signer.crt</a> which has SHA1 fingerprint <pre>12:60:D7:09:6A:D9:C1:43:AD:31:88:14:3C:A8:C4:B7:33:8A:4F:CB</pre></p>
 
 <h2>Production Metadata</h2>
 <p>
 These are metadata feeds to be consumed by SWAMID members and relying parties:
 </p>
-<dl>
+<dl class="dl-horizontal">
 <dt><b>swamid-2.0</b></dt><dd>SWAMID version 2.0 main metadata feed.</dd>
 <dt><b>swamid-idp</b></dt><dd>Aggregate of all SWAMID 2.0 registered identity providers. This is intended to be used by relying parties (SPs) who want to be able to communicate with identity providers in the <b>local</b> SWAMID ring of trust.</dd>
 <dt><b>swamid-idp-transitive</b></dt><dd>Aggregate of all SWAMID 2.0 and SWAMID interfederation identity providers. This is intended to be used by relying parties (SPs) who want to be able to communicate with the full set of identity providers in the <b>full transitive</b> SWAMID ring of trust.</dd>
diff --git a/bootstrap/css/bootstrap.min.css b/bootstrap/css/bootstrap.min.css
new file mode 100644
index 00000000..4cf729e4
--- /dev/null
+++ b/bootstrap/css/bootstrap.min.css
@@ -0,0 +1,6 @@
+/*!
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:transparent;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:rgba(0,0,0,0);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
+/*# sourceMappingURL=bootstrap.min.css.map */
+\ No newline at end of file
diff --git a/bootstrap/fonts/glyphicons-halflings-regular.eot b/bootstrap/fonts/glyphicons-halflings-regular.eot
new file mode 100644
index 00000000..b93a4953
--- /dev/null
+++ b/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/bootstrap/fonts/glyphicons-halflings-regular.svg b/bootstrap/fonts/glyphicons-halflings-regular.svg
new file mode 100644
index 00000000..94fb5490
--- /dev/null
+++ b/bootstrap/fonts/glyphicons-halflings-regular.svg
@@ -0,0 +1,288 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
+<font-face units-per-em="1200" ascent="960" descent="-240" />
+<missing-glyph horiz-adv-x="500" />
+<glyph horiz-adv-x="0" />
+<glyph horiz-adv-x="400" />
+<glyph unicode=" " />
+<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
+<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xa0;" />
+<glyph unicode="&#xa5;" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
+<glyph unicode="&#x2000;" horiz-adv-x="650" />
+<glyph unicode="&#x2001;" horiz-adv-x="1300" />
+<glyph unicode="&#x2002;" horiz-adv-x="650" />
+<glyph unicode="&#x2003;" horiz-adv-x="1300" />
+<glyph unicode="&#x2004;" horiz-adv-x="433" />
+<glyph unicode="&#x2005;" horiz-adv-x="325" />
+<glyph unicode="&#x2006;" horiz-adv-x="216" />
+<glyph unicode="&#x2007;" horiz-adv-x="216" />
+<glyph unicode="&#x2008;" horiz-adv-x="162" />
+<glyph unicode="&#x2009;" horiz-adv-x="260" />
+<glyph unicode="&#x200a;" horiz-adv-x="72" />
+<glyph unicode="&#x202f;" horiz-adv-x="260" />
+<glyph unicode="&#x205f;" horiz-adv-x="325" />
+<glyph unicode="&#x20ac;" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
+<glyph unicode="&#x20bd;" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
+<glyph unicode="&#x2212;" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#x231b;" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
+<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="&#x2601;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
+<glyph unicode="&#x26fa;" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
+<glyph unicode="&#x2709;" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
+<glyph unicode="&#x270f;" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
+<glyph unicode="&#xe001;" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
+<glyph unicode="&#xe002;" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
+<glyph unicode="&#xe003;" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
+<glyph unicode="&#xe005;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
+<glyph unicode="&#xe006;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
+<glyph unicode="&#xe007;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
+<glyph unicode="&#xe008;" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
+<glyph unicode="&#xe009;" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
+<glyph unicode="&#xe010;" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe011;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
+<glyph unicode="&#xe012;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe013;" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
+<glyph unicode="&#xe014;" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
+<glyph unicode="&#xe015;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe016;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe017;" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
+<glyph unicode="&#xe018;" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe019;" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
+<glyph unicode="&#xe020;" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
+<glyph unicode="&#xe021;" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
+<glyph unicode="&#xe022;" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
+<glyph unicode="&#xe023;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe024;" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
+<glyph unicode="&#xe025;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe026;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
+<glyph unicode="&#xe027;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
+<glyph unicode="&#xe028;" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
+<glyph unicode="&#xe029;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
+<glyph unicode="&#xe030;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
+<glyph unicode="&#xe031;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
+<glyph unicode="&#xe032;" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe033;" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
+<glyph unicode="&#xe034;" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
+<glyph unicode="&#xe035;" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
+<glyph unicode="&#xe036;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
+<glyph unicode="&#xe037;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
+<glyph unicode="&#xe038;" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
+<glyph unicode="&#xe039;" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
+<glyph unicode="&#xe040;" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
+<glyph unicode="&#xe041;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
+<glyph unicode="&#xe042;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
+<glyph unicode="&#xe043;" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
+<glyph unicode="&#xe044;" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe045;" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
+<glyph unicode="&#xe046;" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
+<glyph unicode="&#xe047;" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
+<glyph unicode="&#xe048;" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
+<glyph unicode="&#xe049;" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
+<glyph unicode="&#xe050;" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
+<glyph unicode="&#xe051;" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
+<glyph unicode="&#xe052;" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe053;" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe054;" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe055;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe056;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe057;" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe058;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe059;" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
+<glyph unicode="&#xe060;" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
+<glyph unicode="&#xe062;" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
+<glyph unicode="&#xe063;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
+<glyph unicode="&#xe064;" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
+<glyph unicode="&#xe065;" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
+<glyph unicode="&#xe066;" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
+<glyph unicode="&#xe067;" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
+<glyph unicode="&#xe068;" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
+<glyph unicode="&#xe069;" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe070;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe071;" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
+<glyph unicode="&#xe072;" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
+<glyph unicode="&#xe073;" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe074;" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
+<glyph unicode="&#xe075;" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
+<glyph unicode="&#xe076;" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe077;" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe078;" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe079;" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
+<glyph unicode="&#xe080;" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
+<glyph unicode="&#xe081;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
+<glyph unicode="&#xe082;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
+<glyph unicode="&#xe083;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
+<glyph unicode="&#xe084;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
+<glyph unicode="&#xe085;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="&#xe086;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="&#xe087;" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
+<glyph unicode="&#xe088;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="&#xe089;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="&#xe090;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
+<glyph unicode="&#xe091;" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
+<glyph unicode="&#xe092;" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
+<glyph unicode="&#xe093;" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
+<glyph unicode="&#xe094;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe095;" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
+<glyph unicode="&#xe096;" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
+<glyph unicode="&#xe097;" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
+<glyph unicode="&#xe101;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="&#xe102;" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
+<glyph unicode="&#xe103;" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
+<glyph unicode="&#xe104;" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
+<glyph unicode="&#xe105;" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
+<glyph unicode="&#xe106;" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
+<glyph unicode="&#xe107;" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
+<glyph unicode="&#xe108;" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
+<glyph unicode="&#xe109;" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
+<glyph unicode="&#xe110;" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
+<glyph unicode="&#xe111;" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
+<glyph unicode="&#xe112;" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
+<glyph unicode="&#xe113;" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
+<glyph unicode="&#xe114;" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
+<glyph unicode="&#xe115;" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="&#xe116;" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
+<glyph unicode="&#xe117;" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
+<glyph unicode="&#xe118;" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
+<glyph unicode="&#xe119;" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="&#xe120;" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
+<glyph unicode="&#xe121;" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
+<glyph unicode="&#xe122;" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
+<glyph unicode="&#xe123;" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
+<glyph unicode="&#xe124;" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
+<glyph unicode="&#xe125;" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe126;" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
+<glyph unicode="&#xe127;" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe128;" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe129;" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe130;" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
+<glyph unicode="&#xe131;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
+<glyph unicode="&#xe132;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
+<glyph unicode="&#xe133;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
+<glyph unicode="&#xe134;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="&#xe135;" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
+<glyph unicode="&#xe136;" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
+<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
+<glyph unicode="&#xe138;" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
+<glyph unicode="&#xe139;" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
+<glyph unicode="&#xe140;" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
+<glyph unicode="&#xe141;" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
+<glyph unicode="&#xe142;" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
+<glyph unicode="&#xe143;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
+<glyph unicode="&#xe144;" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
+<glyph unicode="&#xe145;" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
+<glyph unicode="&#xe146;" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
+<glyph unicode="&#xe148;" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
+<glyph unicode="&#xe149;" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
+<glyph unicode="&#xe150;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="&#xe151;" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
+<glyph unicode="&#xe152;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
+<glyph unicode="&#xe153;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
+<glyph unicode="&#xe154;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
+<glyph unicode="&#xe155;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
+<glyph unicode="&#xe156;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
+<glyph unicode="&#xe157;" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
+<glyph unicode="&#xe158;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
+<glyph unicode="&#xe159;" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
+<glyph unicode="&#xe160;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
+<glyph unicode="&#xe161;" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
+<glyph unicode="&#xe162;" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
+<glyph unicode="&#xe163;" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
+<glyph unicode="&#xe164;" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
+<glyph unicode="&#xe165;" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
+<glyph unicode="&#xe166;" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
+<glyph unicode="&#xe167;" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
+<glyph unicode="&#xe168;" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
+<glyph unicode="&#xe169;" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
+<glyph unicode="&#xe170;" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
+<glyph unicode="&#xe171;" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
+<glyph unicode="&#xe172;" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
+<glyph unicode="&#xe173;" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="&#xe174;" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
+<glyph unicode="&#xe175;" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe176;" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
+<glyph unicode="&#xe177;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
+<glyph unicode="&#xe178;" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
+<glyph unicode="&#xe179;" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
+<glyph unicode="&#xe180;" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
+<glyph unicode="&#xe181;" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
+<glyph unicode="&#xe182;" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
+<glyph unicode="&#xe183;" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
+<glyph unicode="&#xe184;" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe185;" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
+<glyph unicode="&#xe186;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
+<glyph unicode="&#xe187;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
+<glyph unicode="&#xe188;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
+<glyph unicode="&#xe189;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
+<glyph unicode="&#xe190;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
+<glyph unicode="&#xe191;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
+<glyph unicode="&#xe192;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
+<glyph unicode="&#xe193;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
+<glyph unicode="&#xe194;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
+<glyph unicode="&#xe195;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
+<glyph unicode="&#xe197;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe198;" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
+<glyph unicode="&#xe199;" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
+<glyph unicode="&#xe200;" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
+<glyph unicode="&#xe201;" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
+<glyph unicode="&#xe202;" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
+<glyph unicode="&#xe203;" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
+<glyph unicode="&#xe204;" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
+<glyph unicode="&#xe205;" d="M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z" />
+<glyph unicode="&#xe206;" d="M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
+<glyph unicode="&#xe209;" d="M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
+<glyph unicode="&#xe210;" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe211;" d="M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe212;" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe213;" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe214;" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe215;" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe216;" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" />
+<glyph unicode="&#xe218;" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z" />
+<glyph unicode="&#xe219;" d="M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z" />
+<glyph unicode="&#xe221;" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe223;" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z" />
+<glyph unicode="&#xe224;" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
+<glyph unicode="&#xe225;" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="&#xe226;" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z" />
+<glyph unicode="&#xe227;" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z" />
+<glyph unicode="&#xe230;" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
+<glyph unicode="&#xe231;" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
+<glyph unicode="&#xe232;" d="M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
+<glyph unicode="&#xe233;" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z" />
+<glyph unicode="&#xe234;" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
+<glyph unicode="&#xe235;" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
+<glyph unicode="&#xe236;" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="&#xe237;" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" />
+<glyph unicode="&#xe238;" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe239;" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
+<glyph unicode="&#xe240;" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z" />
+<glyph unicode="&#xe241;" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
+<glyph unicode="&#xe242;" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
+<glyph unicode="&#xe243;" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z" />
+<glyph unicode="&#xe244;" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
+<glyph unicode="&#xe245;" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
+<glyph unicode="&#xe246;" d="M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
+<glyph unicode="&#xe247;" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe248;" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
+<glyph unicode="&#xe249;" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="&#xe250;" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z" />
+<glyph unicode="&#xe251;" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
+<glyph unicode="&#xe252;" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
+<glyph unicode="&#xe253;" d="M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
+<glyph unicode="&#xe254;" d="M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z" />
+<glyph unicode="&#xe255;" d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
+<glyph unicode="&#xe256;" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
+<glyph unicode="&#xe257;" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z" />
+<glyph unicode="&#xe258;" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z" />
+<glyph unicode="&#xe259;" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z" />
+<glyph unicode="&#xe260;" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z" />
+<glyph unicode="&#xf8ff;" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z" />
+<glyph unicode="&#x1f511;" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" />
+<glyph unicode="&#x1f6aa;" d="M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" />
+</font>
+</defs></svg> 
+\ No newline at end of file
diff --git a/bootstrap/fonts/glyphicons-halflings-regular.ttf b/bootstrap/fonts/glyphicons-halflings-regular.ttf
new file mode 100644
index 00000000..1413fc60
--- /dev/null
+++ b/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/bootstrap/fonts/glyphicons-halflings-regular.woff b/bootstrap/fonts/glyphicons-halflings-regular.woff
new file mode 100644
index 00000000..9e612858
--- /dev/null
+++ b/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/bootstrap/fonts/glyphicons-halflings-regular.woff2
new file mode 100644
index 00000000..64539b54
--- /dev/null
+++ b/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml b/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml
index 6419da57..5a37fc30 100644
--- a/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml
@@ -15,10 +15,10 @@
         <mdui:DisplayName xml:lang="sv">Uppsala universitets AKKA DEMO</mdui:DisplayName>
         <mdui:Description xml:lang="en">Authentication Control - Directory Administration DEMO</mdui:Description>
         <mdui:Description xml:lang="sv">Autentisering Kontroll - Katalogadministration DEMO</mdui:Description>
-        <mdui:Logo height="50" width="50"> https://demo.weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="50" width="50"> https://demo.weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en"> http://akka-adm.demo.its.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv"> http://akka-adm.demo.its.uu.se</mdui:InformationURL>
+        <mdui:Logo height="50" width="50">https://demo.weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://demo.weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://akka-adm.demo.its.uu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">http://akka-adm.demo.its.uu.se</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/akka-adm.uu.se-shibboleth.xml b/swamid-2.0/akka-adm.uu.se-shibboleth.xml
index a1476b87..72c69d08 100644
--- a/swamid-2.0/akka-adm.uu.se-shibboleth.xml
+++ b/swamid-2.0/akka-adm.uu.se-shibboleth.xml
@@ -7,10 +7,10 @@
         <mdui:DisplayName xml:lang="sv">Uppsala universitets AKKA</mdui:DisplayName>
         <mdui:Description xml:lang="en">Authentication Control - Directory Administration</mdui:Description>
         <mdui:Description xml:lang="sv">Autentisering Kontroll - Katalogadministration</mdui:Description>
-        <mdui:Logo height="50" width="50"> https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="50" width="50"> https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en"> http://akka.uadm.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv"> http://akka.uadm.uu.se</mdui:InformationURL>
+        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://akka.uadm.uu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">http://akka.uadm.uu.se</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml b/swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml
index 1966bb0e..5a634f3e 100644
--- a/swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml
+++ b/swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml
@@ -21,6 +21,12 @@ and do *NOT* provide it in real time to your partners.
     <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+      </samla: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>
diff --git a/swamid-2.0/dawn.bmc.lu.se-shibboleth.xml b/swamid-2.0/dawn.bmc.lu.se-shibboleth.xml
index d0bcf9f7..ce1c8cb7 100644
--- a/swamid-2.0/dawn.bmc.lu.se-shibboleth.xml
+++ b/swamid-2.0/dawn.bmc.lu.se-shibboleth.xml
@@ -14,7 +14,7 @@
         <mdui:DisplayName xml:lang="sv">Portal, Medicinska fakulteten, Lunds universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Web Portal, Medical Faculty, Lund university</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Användarportal för anställda vid Lunds universitet - utvecklad vid Medicinska fakulteten,Lund</mdui:Description>
-        <mdui:Description xml:lang="en">Intranet for co-workers at Lund university - developed by the medical faculty, Lund </mdui:Description>
+        <mdui:Description xml:lang="en">Intranet for co-workers at Lund university - developed by the medical faculty, Lund</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml b/swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml
index dfb91799..05868153 100644
--- a/swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml
+++ b/swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml
@@ -25,11 +25,11 @@ and do *NOT* provide it in real time to your partners.
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv"> PING PONG vid GIH </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en"> PING PONG at GIH </mdui:DisplayName>
-        <mdui:Description xml:lang="sv"> Lärplattformen PING PONG vid Gymnastik- och idrottshögskolan. </mdui:Description>
-        <mdui:Description xml:lang="en"> The learning platform PING PONG at The Swedish School of Sport and Health Sciences. </mdui:Description>
-        <mdui:Logo height="168" width="50">https://gih.pingpong.se/login/pingpong-logo-168x50.png </mdui:Logo>
+        <mdui:DisplayName xml:lang="sv">PING PONG vid GIH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">PING PONG at GIH</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Lärplattformen PING PONG vid Gymnastik- och idrottshögskolan.</mdui:Description>
+        <mdui:Description xml:lang="en">The learning platform PING PONG at The Swedish School of Sport and Health Sciences.</mdui:Description>
+        <mdui:Logo height="168" width="50">https://gih.pingpong.se/login/pingpong-logo-168x50.png</mdui:Logo>
         <mdui:Logo height="16" width="16">https://gih.pingpong.se/login/pingpong-logo-16x16.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://gih.pingpong.se/Shibboleth.sso/Login"/>
diff --git a/swamid-2.0/hig-test.blackboard.com-shibboleth-sp.xml b/swamid-2.0/hig-test.blackboard.com-shibboleth-sp.xml
index bf6c4181..db6f93b2 100644
--- a/swamid-2.0/hig-test.blackboard.com-shibboleth-sp.xml
+++ b/swamid-2.0/hig-test.blackboard.com-shibboleth-sp.xml
@@ -24,7 +24,7 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">TEST-Blackboard (Learning Management System)</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">TEST-Blackboard lärplattform</mdui:DisplayName>
-        <mdui:Description xml:lang="en">TEST-Blackboard is a web based learning management system, for courses at the University of Gävle. The system is used for both campus courses and distance learning. </mdui:Description>
+        <mdui:Description xml:lang="en">TEST-Blackboard is a web based learning management system, for courses at the University of Gävle. The system is used for both campus courses and distance learning.</mdui:Description>
         <mdui:Description xml:lang="sv">TEST-Blackboard är ett webbaserat system för hantering av kurser vid Högskolan i Gävle, en så kallad lärplattform. Systemet kan användas för både campus- och distanskurser.</mdui:Description>
         <mdui:Logo height="45" width="50">https://webkonto.student.hig.se/img/cencolor-50.gif</mdui:Logo>
         <mdui:Logo xml:lang="sv" height="44" width="50">https://webkonto.student.hig.se/img/cenfarg-50.gif</mdui:Logo>
diff --git a/swamid-2.0/hig.blackboard.com-shibboleth-sp.xml b/swamid-2.0/hig.blackboard.com-shibboleth-sp.xml
index 0cf64a7c..29a464de 100644
--- a/swamid-2.0/hig.blackboard.com-shibboleth-sp.xml
+++ b/swamid-2.0/hig.blackboard.com-shibboleth-sp.xml
@@ -28,7 +28,7 @@ and do *NOT* provide it in real time to your partners.
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Blackboard (Learning Management System)</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Blackboard lärplattform</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Blackboard is a web based learning management system, for courses at the University of Gävle. The system is used for both campus courses and distance learning. </mdui:Description>
+        <mdui:Description xml:lang="en">Blackboard is a web based learning management system, for courses at the University of Gävle. The system is used for both campus courses and distance learning.</mdui:Description>
         <mdui:Description xml:lang="sv">Blackboard är ett webbaserat system för hantering av kurser vid Högskolan i Gävle, en så kallad lärplattform. Systemet kan användas för både campus- och distanskurser.</mdui:Description>
         <mdui:Logo height="45" width="50">https://webkonto.student.hig.se/img/cencolor-50.gif</mdui:Logo>
         <mdui:Logo xml:lang="sv" height="44" width="50">https://webkonto.student.hig.se/img/cenfarg-50.gif</mdui:Logo>
diff --git a/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml b/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
new file mode 100644
index 00000000..7e29e377
--- /dev/null
+++ b/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
@@ -0,0 +1,726 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-v2.konstfack.se/adfs/services/trust">
+  <Extensions>
+    <shibmd:Scope regexp="false">konstfack.se</shibmd:Scope>
+  </Extensions>
+  <RoleDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp-v2.konstfack.se">
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <fed:ClaimTypesRequested>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
+        <auth:DisplayName>E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
+        <auth:DisplayName>Given Name</auth:DisplayName>
+        <auth:Description>The given name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
+        <auth:DisplayName>Name</auth:DisplayName>
+        <auth:Description>The unique name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
+        <auth:DisplayName>UPN</auth:DisplayName>
+        <auth:Description>The user principal name (UPN) of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
+        <auth:DisplayName>Common Name</auth:DisplayName>
+        <auth:Description>The common name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
+        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
+        <auth:DisplayName>Group</auth:DisplayName>
+        <auth:Description>A group that the user is a member of</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
+        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
+        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
+        <auth:DisplayName>Role</auth:DisplayName>
+        <auth:Description>A role that the user has</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
+        <auth:DisplayName>Surname</auth:DisplayName>
+        <auth:Description>The surname of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
+        <auth:DisplayName>PPID</auth:DisplayName>
+        <auth:Description>The private identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
+        <auth:DisplayName>Name ID</auth:DisplayName>
+        <auth:Description>The SAML name identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
+        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
+        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
+        <auth:DisplayName>Authentication method</auth:DisplayName>
+        <auth:Description>The method used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
+        <auth:DisplayName>Deny only group SID</auth:DisplayName>
+        <auth:Description>The deny-only group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
+        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
+        <auth:Description>The deny-only primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
+        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
+        <auth:Description>The deny-only primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
+        <auth:DisplayName>Group SID</auth:DisplayName>
+        <auth:Description>The group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
+        <auth:DisplayName>Primary group SID</auth:DisplayName>
+        <auth:Description>The primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
+        <auth:DisplayName>Primary SID</auth:DisplayName>
+        <auth:Description>The primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
+        <auth:DisplayName>Windows account name</auth:DisplayName>
+        <auth:Description>The domain account name of the user in the form of domain\user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" Optional="true">
+        <auth:DisplayName>Is Registered User</auth:DisplayName>
+        <auth:Description>User is registered to use this device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" Optional="true">
+        <auth:DisplayName>Device Identifier</auth:DisplayName>
+        <auth:Description>Identifier of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" Optional="true">
+        <auth:DisplayName>Device Registration Identifier</auth:DisplayName>
+        <auth:Description>Identifier for Device Registration</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" Optional="true">
+        <auth:DisplayName>Device Registration DisplayName</auth:DisplayName>
+        <auth:Description>Display name of Device Registration</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" Optional="true">
+        <auth:DisplayName>Device OS type</auth:DisplayName>
+        <auth:Description>OS type of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" Optional="true">
+        <auth:DisplayName>Device OS Version</auth:DisplayName>
+        <auth:Description>OS version of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" Optional="true">
+        <auth:DisplayName>Is Managed Device</auth:DisplayName>
+        <auth:Description>Device is managed by a management service</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" Optional="true">
+        <auth:DisplayName>Forwarded Client IP</auth:DisplayName>
+        <auth:Description>IP address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" Optional="true">
+        <auth:DisplayName>Client Application</auth:DisplayName>
+        <auth:Description>Type of the Client Application</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" Optional="true">
+        <auth:DisplayName>Client User Agent</auth:DisplayName>
+        <auth:Description>Device type the client is using to access the application</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" Optional="true">
+        <auth:DisplayName>Client IP</auth:DisplayName>
+        <auth:Description>IP address of the client</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" Optional="true">
+        <auth:DisplayName>Endpoint Path</auth:DisplayName>
+        <auth:Description>Absolute Endpoint path which can be used to determine active versus passive clients</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" Optional="true">
+        <auth:DisplayName>Proxy</auth:DisplayName>
+        <auth:Description>DNS name of the federation server proxy that passed the request</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" Optional="true">
+        <auth:DisplayName>Application Identifier</auth:DisplayName>
+        <auth:Description>Identifier for the Relying Party</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" Optional="true">
+        <auth:DisplayName>Application policies</auth:DisplayName>
+        <auth:Description>Application policies of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" Optional="true">
+        <auth:DisplayName>Authority Key Identifier</auth:DisplayName>
+        <auth:Description>The Authority Key Identifier extension of the certificate that signed an issued certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" Optional="true">
+        <auth:DisplayName>Basic Constraint</auth:DisplayName>
+        <auth:Description>One of the basic constraints of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" Optional="true">
+        <auth:DisplayName>Enhanced Key Usage</auth:DisplayName>
+        <auth:Description>Describes one of the enhanced key usages of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" Optional="true">
+        <auth:DisplayName>Issuer</auth:DisplayName>
+        <auth:Description>The name of the certificate authority that issued the X.509 certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" Optional="true">
+        <auth:DisplayName>Issuer Name</auth:DisplayName>
+        <auth:Description>The distinguished name of the certificate issuer</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" Optional="true">
+        <auth:DisplayName>Key Usage</auth:DisplayName>
+        <auth:Description>One of the key usages of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" Optional="true">
+        <auth:DisplayName>Not After</auth:DisplayName>
+        <auth:Description>Date in local time after which a certificate is no longer valid</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" Optional="true">
+        <auth:DisplayName>Not Before</auth:DisplayName>
+        <auth:Description>The date in local time on which a certificate becomes valid</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" Optional="true">
+        <auth:DisplayName>Certificate Policies</auth:DisplayName>
+        <auth:Description>The policies under which the certificate has been issued</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" Optional="true">
+        <auth:DisplayName>Public Key</auth:DisplayName>
+        <auth:Description>Public Key of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" Optional="true">
+        <auth:DisplayName>Certificate Raw Data</auth:DisplayName>
+        <auth:Description>The raw data of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" Optional="true">
+        <auth:DisplayName>Subject Alternative Name</auth:DisplayName>
+        <auth:Description>One of the alternative names of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" Optional="true">
+        <auth:DisplayName>Serial Number</auth:DisplayName>
+        <auth:Description>The serial number of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" Optional="true">
+        <auth:DisplayName>Signature Algorithm</auth:DisplayName>
+        <auth:Description>The algorithm used to create the signature of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" Optional="true">
+        <auth:DisplayName>Subject</auth:DisplayName>
+        <auth:Description>The subject from the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" Optional="true">
+        <auth:DisplayName>Subject Key Identifier</auth:DisplayName>
+        <auth:Description>Describes the subject key identifier of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" Optional="true">
+        <auth:DisplayName>Subject Name</auth:DisplayName>
+        <auth:Description>The subject distinguished name from a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" Optional="true">
+        <auth:DisplayName>V2 Template Name</auth:DisplayName>
+        <auth:Description>The name of the version 2 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" Optional="true">
+        <auth:DisplayName>V1 Template Name</auth:DisplayName>
+        <auth:Description>The name of the version 1 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" Optional="true">
+        <auth:DisplayName>Thumbprint</auth:DisplayName>
+        <auth:Description>Thumbprint of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" Optional="true">
+        <auth:DisplayName>X.509 Version</auth:DisplayName>
+        <auth:Description>The X.509 format version of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" Optional="true">
+        <auth:DisplayName>Inside Corporate Network</auth:DisplayName>
+        <auth:Description>Used to indicate if a request originated inside corporate network</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" Optional="true">
+        <auth:DisplayName>Password Expiration Time</auth:DisplayName>
+        <auth:Description>Used to display the time when the password expires</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" Optional="true">
+        <auth:DisplayName>Password Expiration Days</auth:DisplayName>
+        <auth:Description>Used to display the number of days to password expiry</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" Optional="true">
+        <auth:DisplayName>Update Password URL</auth:DisplayName>
+        <auth:Description>Used to display the web address of update password service</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/claims/authnmethodsreferences" Optional="true">
+        <auth:DisplayName>Authentication Methods References</auth:DisplayName>
+        <auth:Description>Used to indicate all authentication methods used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" Optional="true">
+        <auth:DisplayName>Client Request ID</auth:DisplayName>
+        <auth:Description>Identifier for a user session</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2013/11/alternateloginid" Optional="true">
+        <auth:DisplayName>Alternate Login ID</auth:DisplayName>
+        <auth:Description>Alternate login ID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/employeeID" Optional="true">
+        <auth:DisplayName>employeeID</auth:DisplayName>
+      </auth:ClaimType>
+    </fed:ClaimTypesRequested>
+    <fed:TargetScopes>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/ls/</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust</Address>
+      </EndpointReference>
+    </fed:TargetScopes>
+    <fed:ApplicationServiceEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+    </fed:ApplicationServiceEndpoint>
+    <fed:PassiveRequestorEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/ls/</Address>
+      </EndpointReference>
+    </fed:PassiveRequestorEndpoint>
+  </RoleDescriptor>
+  <RoleDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:SecurityTokenServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp-v2.konstfack.se">
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <fed:TokenTypesOffered>
+      <fed:TokenType Uri="urn:oasis:names:tc:SAML:2.0:assertion"/>
+      <fed:TokenType Uri="urn:oasis:names:tc:SAML:1.0:assertion"/>
+    </fed:TokenTypesOffered>
+    <fed:ClaimTypesOffered>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
+        <auth:DisplayName>E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
+        <auth:DisplayName>Given Name</auth:DisplayName>
+        <auth:Description>The given name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
+        <auth:DisplayName>Name</auth:DisplayName>
+        <auth:Description>The unique name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
+        <auth:DisplayName>UPN</auth:DisplayName>
+        <auth:Description>The user principal name (UPN) of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
+        <auth:DisplayName>Common Name</auth:DisplayName>
+        <auth:Description>The common name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
+        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
+        <auth:DisplayName>Group</auth:DisplayName>
+        <auth:Description>A group that the user is a member of</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
+        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
+        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
+        <auth:DisplayName>Role</auth:DisplayName>
+        <auth:Description>A role that the user has</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
+        <auth:DisplayName>Surname</auth:DisplayName>
+        <auth:Description>The surname of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
+        <auth:DisplayName>PPID</auth:DisplayName>
+        <auth:Description>The private identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
+        <auth:DisplayName>Name ID</auth:DisplayName>
+        <auth:Description>The SAML name identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
+        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
+        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
+        <auth:DisplayName>Authentication method</auth:DisplayName>
+        <auth:Description>The method used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
+        <auth:DisplayName>Deny only group SID</auth:DisplayName>
+        <auth:Description>The deny-only group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
+        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
+        <auth:Description>The deny-only primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
+        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
+        <auth:Description>The deny-only primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
+        <auth:DisplayName>Group SID</auth:DisplayName>
+        <auth:Description>The group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
+        <auth:DisplayName>Primary group SID</auth:DisplayName>
+        <auth:Description>The primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
+        <auth:DisplayName>Primary SID</auth:DisplayName>
+        <auth:Description>The primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
+        <auth:DisplayName>Windows account name</auth:DisplayName>
+        <auth:Description>The domain account name of the user in the form of domain\user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" Optional="true">
+        <auth:DisplayName>Is Registered User</auth:DisplayName>
+        <auth:Description>User is registered to use this device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" Optional="true">
+        <auth:DisplayName>Device Identifier</auth:DisplayName>
+        <auth:Description>Identifier of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" Optional="true">
+        <auth:DisplayName>Device Registration Identifier</auth:DisplayName>
+        <auth:Description>Identifier for Device Registration</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" Optional="true">
+        <auth:DisplayName>Device Registration DisplayName</auth:DisplayName>
+        <auth:Description>Display name of Device Registration</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" Optional="true">
+        <auth:DisplayName>Device OS type</auth:DisplayName>
+        <auth:Description>OS type of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" Optional="true">
+        <auth:DisplayName>Device OS Version</auth:DisplayName>
+        <auth:Description>OS version of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" Optional="true">
+        <auth:DisplayName>Is Managed Device</auth:DisplayName>
+        <auth:Description>Device is managed by a management service</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" Optional="true">
+        <auth:DisplayName>Forwarded Client IP</auth:DisplayName>
+        <auth:Description>IP address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" Optional="true">
+        <auth:DisplayName>Client Application</auth:DisplayName>
+        <auth:Description>Type of the Client Application</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" Optional="true">
+        <auth:DisplayName>Client User Agent</auth:DisplayName>
+        <auth:Description>Device type the client is using to access the application</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" Optional="true">
+        <auth:DisplayName>Client IP</auth:DisplayName>
+        <auth:Description>IP address of the client</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" Optional="true">
+        <auth:DisplayName>Endpoint Path</auth:DisplayName>
+        <auth:Description>Absolute Endpoint path which can be used to determine active versus passive clients</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" Optional="true">
+        <auth:DisplayName>Proxy</auth:DisplayName>
+        <auth:Description>DNS name of the federation server proxy that passed the request</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" Optional="true">
+        <auth:DisplayName>Application Identifier</auth:DisplayName>
+        <auth:Description>Identifier for the Relying Party</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" Optional="true">
+        <auth:DisplayName>Application policies</auth:DisplayName>
+        <auth:Description>Application policies of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" Optional="true">
+        <auth:DisplayName>Authority Key Identifier</auth:DisplayName>
+        <auth:Description>The Authority Key Identifier extension of the certificate that signed an issued certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" Optional="true">
+        <auth:DisplayName>Basic Constraint</auth:DisplayName>
+        <auth:Description>One of the basic constraints of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" Optional="true">
+        <auth:DisplayName>Enhanced Key Usage</auth:DisplayName>
+        <auth:Description>Describes one of the enhanced key usages of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" Optional="true">
+        <auth:DisplayName>Issuer</auth:DisplayName>
+        <auth:Description>The name of the certificate authority that issued the X.509 certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" Optional="true">
+        <auth:DisplayName>Issuer Name</auth:DisplayName>
+        <auth:Description>The distinguished name of the certificate issuer</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" Optional="true">
+        <auth:DisplayName>Key Usage</auth:DisplayName>
+        <auth:Description>One of the key usages of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" Optional="true">
+        <auth:DisplayName>Not After</auth:DisplayName>
+        <auth:Description>Date in local time after which a certificate is no longer valid</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" Optional="true">
+        <auth:DisplayName>Not Before</auth:DisplayName>
+        <auth:Description>The date in local time on which a certificate becomes valid</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" Optional="true">
+        <auth:DisplayName>Certificate Policies</auth:DisplayName>
+        <auth:Description>The policies under which the certificate has been issued</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" Optional="true">
+        <auth:DisplayName>Public Key</auth:DisplayName>
+        <auth:Description>Public Key of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" Optional="true">
+        <auth:DisplayName>Certificate Raw Data</auth:DisplayName>
+        <auth:Description>The raw data of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" Optional="true">
+        <auth:DisplayName>Subject Alternative Name</auth:DisplayName>
+        <auth:Description>One of the alternative names of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" Optional="true">
+        <auth:DisplayName>Serial Number</auth:DisplayName>
+        <auth:Description>The serial number of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" Optional="true">
+        <auth:DisplayName>Signature Algorithm</auth:DisplayName>
+        <auth:Description>The algorithm used to create the signature of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" Optional="true">
+        <auth:DisplayName>Subject</auth:DisplayName>
+        <auth:Description>The subject from the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" Optional="true">
+        <auth:DisplayName>Subject Key Identifier</auth:DisplayName>
+        <auth:Description>Describes the subject key identifier of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" Optional="true">
+        <auth:DisplayName>Subject Name</auth:DisplayName>
+        <auth:Description>The subject distinguished name from a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" Optional="true">
+        <auth:DisplayName>V2 Template Name</auth:DisplayName>
+        <auth:Description>The name of the version 2 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" Optional="true">
+        <auth:DisplayName>V1 Template Name</auth:DisplayName>
+        <auth:Description>The name of the version 1 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" Optional="true">
+        <auth:DisplayName>Thumbprint</auth:DisplayName>
+        <auth:Description>Thumbprint of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" Optional="true">
+        <auth:DisplayName>X.509 Version</auth:DisplayName>
+        <auth:Description>The X.509 format version of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" Optional="true">
+        <auth:DisplayName>Inside Corporate Network</auth:DisplayName>
+        <auth:Description>Used to indicate if a request originated inside corporate network</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" Optional="true">
+        <auth:DisplayName>Password Expiration Time</auth:DisplayName>
+        <auth:Description>Used to display the time when the password expires</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" Optional="true">
+        <auth:DisplayName>Password Expiration Days</auth:DisplayName>
+        <auth:Description>Used to display the number of days to password expiry</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" Optional="true">
+        <auth:DisplayName>Update Password URL</auth:DisplayName>
+        <auth:Description>Used to display the web address of update password service</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/claims/authnmethodsreferences" Optional="true">
+        <auth:DisplayName>Authentication Methods References</auth:DisplayName>
+        <auth:Description>Used to indicate all authentication methods used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" Optional="true">
+        <auth:DisplayName>Client Request ID</auth:DisplayName>
+        <auth:Description>Identifier for a user session</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2013/11/alternateloginid" Optional="true">
+        <auth:DisplayName>Alternate Login ID</auth:DisplayName>
+        <auth:Description>Alternate login ID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/employeeID" Optional="true">
+        <auth:DisplayName>employeeID</auth:DisplayName>
+      </auth:ClaimType>
+    </fed:ClaimTypesOffered>
+    <fed:SecurityTokenServiceEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/2005/certificatemixed</Address>
+        <Metadata>
+          <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex">
+            <wsx:MetadataSection xmlns="" Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex">
+              <wsx:MetadataReference>
+                <Address xmlns="http://www.w3.org/2005/08/addressing">https://idp-v2.konstfack.se/adfs/services/trust/mex</Address>
+              </wsx:MetadataReference>
+            </wsx:MetadataSection>
+          </Metadata>
+        </Metadata>
+      </EndpointReference>
+    </fed:SecurityTokenServiceEndpoint>
+    <fed:PassiveRequestorEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/ls/</Address>
+      </EndpointReference>
+    </fed:PassiveRequestorEndpoint>
+  </RoleDescriptor>
+  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-v2.konstfack.se/adfs/ls/" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/" index="2"/>
+  </SPSSODescriptor>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">konstfack.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-v2.konstfack.se/adfs/services/trust/artifactresolution" index="0"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Registered User"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Identifier"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration Identifier"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration DisplayName"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS type"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS Version"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Managed Device"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Forwarded Client IP"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Application"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client User Agent"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client IP"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Endpoint Path"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Proxy"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application Identifier"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application policies"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authority Key Identifier"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Basic Constraint"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Enhanced Key Usage"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Key Usage"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not After"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not Before"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Policies"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Public Key"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Raw Data"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Alternative Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Serial Number"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Signature Algorithm"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Key Identifier"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V2 Template Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V1 Template Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Thumbprint"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="X.509 Version"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Inside Corporate Network"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Time"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Days"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Update Password URL"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication Methods References"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Request ID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2013/11/alternateloginid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Alternate Login ID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/employeeID" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeID"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="sv-SE">Konstfack</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv-SE">Konstfack</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv-SE">http://www.konstfack.se/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Håkan</GivenName>
+    <SurName>Pettersson</SurName>
+    <EmailAddress>netsupport@konstfack.se</EmailAddress>
+    <TelephoneNumber>+46-8-4504100</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/idp.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.bth.se-idp-shibboleth.xml
index c58b6ca4..81028a94 100644
--- a/swamid-2.0/idp.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.bth.se-idp-shibboleth.xml
@@ -10,8 +10,8 @@
         <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: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>
diff --git a/swamid-2.0/idp.kb.se-idp-shibboleth.xml b/swamid-2.0/idp.kb.se-idp-shibboleth.xml
index ee1ba4d1..8d97317a 100644
--- a/swamid-2.0/idp.kb.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kb.se-idp-shibboleth.xml
@@ -11,8 +11,8 @@
         <mdui:InformationURL xml:lang="sv">http://www.kb.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.kb.se</mdui:InformationURL>
         <mdui:Logo height="488" width="516">https://idp.kb.se/idp/images/logga_FB.gif</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">Kungliga+biblioteket national+library+of+sweden </mdui:Keywords>
-        <mdui:Keywords xml:lang="en">Kungliga+biblioteket national+library+of+sweden </mdui:Keywords>
+        <mdui: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>
         <mdui:DomainHint>kb.se</mdui:DomainHint>
diff --git a/swamid-2.0/idp.kkh.se-idp-shibboleth.xml b/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
index 45b9c139..df08212c 100644
--- a/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
@@ -15,8 +15,8 @@
         <mdui:DisplayName xml:lang="en">Royal Institute of Art</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Kungl. Konsthögskolan (KKH)</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for the Royal Institute of Art (KKH)</mdui:Description>
-        <mdui:Keywords xml:lang="sv">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art </mdui:Keywords>
-        <mdui:Keywords xml:lang="en">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art </mdui:Keywords>
+        <mdui:Keywords xml:lang="sv">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art</mdui:Keywords>
         <mdui:InformationURL xml:lang="sv">http://kkh.se/index.php/sv/om-kkh</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://kkh.se/index.php/en/about-kkh</mdui:InformationURL>
         <mdui:Logo height="110" width="404">https://idp.kkh.se/idp/images/kkh.png</mdui:Logo>
diff --git a/swamid-2.0/idpv3.lu.se-idp-shibboleth.xml b/swamid-2.0/idpv3.lu.se-idp-shibboleth.xml
index 9ccf55aa..73cace37 100644
--- a/swamid-2.0/idpv3.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idpv3.lu.se-idp-shibboleth.xml
@@ -22,8 +22,8 @@
         <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:Keywords xml:lang="sv">lu lth </mdui:Keywords>
-        <mdui:Keywords xml:lang="en">lu lth </mdui:Keywords>
+        <mdui:Keywords xml:lang="sv">lu lth</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">lu lth</mdui:Keywords>
         <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:UIInfo>
diff --git a/swamid-2.0/internt.geol.lu.se-shibboleth.xml b/swamid-2.0/internt.geol.lu.se-shibboleth.xml
index 22f51ecc..42702191 100644
--- a/swamid-2.0/internt.geol.lu.se-shibboleth.xml
+++ b/swamid-2.0/internt.geol.lu.se-shibboleth.xml
@@ -34,7 +34,7 @@
         <mdui:Description xml:lang="en">Webserver with booking system and other resources for internal use at Geocentrum, LU</mdui:Description>
         <mdui:Description xml:lang="sv">Webserver med bokningssystem och andra interna resurser för Geocentrum, LU</mdui:Description>
         <mdui:InformationURL xml:lang="en">https://internt.geol.lu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv"> https://internt.geol.lu.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://internt.geol.lu.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml b/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml
new file mode 100644
index 00000000..dc2717d3
--- /dev/null
+++ b/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://keystone-beta.cloud.ipnett.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">IPnett Cloud Services Beta</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">IPnett Cloud Services Beta</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IPnett Cloud Services OpenStack</mdui:Description>
+        <mdui:Description xml:lang="sv">IPnett Cloud Services OpenStack</mdui:Description>
+        <mdui:Logo width="77" height="64">https://idp.cloud.ipnett.se/ipnett.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+            MIIDIzCCAgugAwIBAgIJAPPowPSKvgZgMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
+            BAMMHWtleXN0b25lLWJldGEuY2xvdWQuaXBuZXR0LnNlMB4XDTE2MDMzMDA2MTY0
+            OVoXDTI3MDMxMzA2MTY0OVowKDEmMCQGA1UEAwwda2V5c3RvbmUtYmV0YS5jbG91
+            ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbE4Dd
+            PYdXSY28N+u22x7Zpe+9tw/GA8ZqUY82loAk0tZ1m5erQNcW11USum8a8socSi0r
+            QDzHsratiV6s/+8pyp+NorwfONAx/tP5HdvDDWUhJFld6oo6fEhyxk7XIFyuz9Th
+            PkGls8CLphjPvUcvoBu86Uw0bBGC4+bmde5UiNN/8spCWB4IeAzWLNYtF81r9+wA
+            uDPqimL5u2SUH3INquU72oGg6brL+lGOkoFt162YQnBnN6fQEzVmLzvagdXGKw+m
+            /YTph+WnNEeOz2gV9Hhf5gyri3fPk1kXqGlO0w/F4UdTSIV7ypdW8NkrYCf7INbk
+            kETtWcxTjNYOEnL7AgMBAAGjUDBOMB0GA1UdDgQWBBRJBzbqYNaDlZW94WVGApLN
+            XtSrrjAfBgNVHSMEGDAWgBRJBzbqYNaDlZW94WVGApLNXtSrrjAMBgNVHRMEBTAD
+            AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAHw0OXubM7aFCCQal1ZQiNBMZnvePqzujg
+            Yn6c9IRNNMvax9w31hVOLWaE6Kpa++T6LppwI952y3wSqevDPf180dySQWtstziI
+            D7Lz/Kjll9LN8mArW1jJ4psqDU9RX4otDP8AUUVo5K9daCjBbxcj4RIMfpmlcw7a
+            MpN8pGtS0Z6VNxC4XsCmM+2mRu4cvlwhHOwu7hy4vK8OLOaj6SNiJYHSi/5ZoQv7
+            VNEtE1FJ0y6Fox7OG48x+S//SkzDkNkOgo/tRSJhb5bQQBpOMtNF6WNp8cqnkFst
+            uCNQenEiZ9DSiyNJmsiqWMsdir/9+GWp0VpsJLLq878kAxtPFQid
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+            MIIDIzCCAgugAwIBAgIJAPPowPSKvgZgMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
+            BAMMHWtleXN0b25lLWJldGEuY2xvdWQuaXBuZXR0LnNlMB4XDTE2MDMzMDA2MTY0
+            OVoXDTI3MDMxMzA2MTY0OVowKDEmMCQGA1UEAwwda2V5c3RvbmUtYmV0YS5jbG91
+            ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbE4Dd
+            PYdXSY28N+u22x7Zpe+9tw/GA8ZqUY82loAk0tZ1m5erQNcW11USum8a8socSi0r
+            QDzHsratiV6s/+8pyp+NorwfONAx/tP5HdvDDWUhJFld6oo6fEhyxk7XIFyuz9Th
+            PkGls8CLphjPvUcvoBu86Uw0bBGC4+bmde5UiNN/8spCWB4IeAzWLNYtF81r9+wA
+            uDPqimL5u2SUH3INquU72oGg6brL+lGOkoFt162YQnBnN6fQEzVmLzvagdXGKw+m
+            /YTph+WnNEeOz2gV9Hhf5gyri3fPk1kXqGlO0w/F4UdTSIV7ypdW8NkrYCf7INbk
+            kETtWcxTjNYOEnL7AgMBAAGjUDBOMB0GA1UdDgQWBBRJBzbqYNaDlZW94WVGApLN
+            XtSrrjAfBgNVHSMEGDAWgBRJBzbqYNaDlZW94WVGApLNXtSrrjAMBgNVHRMEBTAD
+            AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAHw0OXubM7aFCCQal1ZQiNBMZnvePqzujg
+            Yn6c9IRNNMvax9w31hVOLWaE6Kpa++T6LppwI952y3wSqevDPf180dySQWtstziI
+            D7Lz/Kjll9LN8mArW1jJ4psqDU9RX4otDP8AUUVo5K9daCjBbxcj4RIMfpmlcw7a
+            MpN8pGtS0Z6VNxC4XsCmM+2mRu4cvlwhHOwu7hy4vK8OLOaj6SNiJYHSi/5ZoQv7
+            VNEtE1FJ0y6Fox7OG48x+S//SkzDkNkOgo/tRSJhb5bQQBpOMtNF6WNp8cqnkFst
+            uCNQenEiZ9DSiyNJmsiqWMsdir/9+GWp0VpsJLLq878kAxtPFQid
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keystone-beta.cloud.ipnett.se/Shibboleth.sso/Logout"/>
+    <md:AssertionConsumerService Location="https://keystone-beta.cloud.ipnett.se/Shibboleth.sso/SAML2/POST" index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">IPnett Cloud Services OpenStack</md:ServiceName>
+      <md:ServiceName xml:lang="sv">IPnett Cloud Services OpenStack</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="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: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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/lms.hig.se-shibboleth-sp.xml b/swamid-2.0/lms.hig.se-shibboleth-sp.xml
index 2454de66..3d3774f8 100644
--- a/swamid-2.0/lms.hig.se-shibboleth-sp.xml
+++ b/swamid-2.0/lms.hig.se-shibboleth-sp.xml
@@ -24,7 +24,7 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Blackboard (Learning Management System)</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Blackboard lärplattform</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Blackboard is a web based learning management system, for courses at the University of Gävle. The system is used for both campus courses and distance learning. </mdui:Description>
+        <mdui:Description xml:lang="en">Blackboard is a web based learning management system, for courses at the University of Gävle. The system is used for both campus courses and distance learning.</mdui:Description>
         <mdui:Description xml:lang="sv">Blackboard är ett webbaserat system för hantering av kurser vid Högskolan i Gävle, en så kallad lärplattform. Systemet kan användas för både campus- och distanskurser.</mdui:Description>
         <mdui:Logo height="45" width="50">https://webkonto.student.hig.se/img/cencolor-50.gif</mdui:Logo>
         <mdui:Logo xml:lang="sv" height="44" width="50">https://webkonto.student.hig.se/img/cenfarg-50.gif</mdui:Logo>
diff --git a/swamid-2.0/ls00001.mah.se-idp-shibboleth.xml b/swamid-2.0/ls00001.mah.se-idp-shibboleth.xml
new file mode 100644
index 00000000..c0ac97eb
--- /dev/null
+++ b/swamid-2.0/ls00001.mah.se-idp-shibboleth.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://ls00001.mah.se/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope regexp="false">mah.se</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Malmö högskola *TEST*</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Malmö University *TEST*</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Malmö högskola *TEST*</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Malmö University *TEST*</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 xml:lang="sv" height="195" width="132">http://cdn.mah.se/images/header/sv/logo_sv.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="195" width="132">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>
+        <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>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUPrvA/P0+Dsrc50jusZnN26yth0cwDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTJaFw0zNjAz
+MjIwODExNTJaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCCYTQPJO3eMFyM1s95c9+L6GqieSDW421ziu+LKsau
+HGw1bYbSN/QFV//WSFu7kVTXOlyHw7oCKOCPAsnAeZwO7ulFjL7XbmsXgUhC7Zce
+A7lHXakjMoLXGTbz07xPRjhjLs31TG6wfQBwec5aot+yfRmuy2ag+DOWCQDvVND5
+PDgdH7MNURiJD0POpaPv/w1PNm55hpqxxAQpXrn6KZuUdLtihWQKsK0UeEEf52Pi
+9dlrVnDArIredcnDA8uQz578Ve/JgmJYlRfhMa2XKGkz8IwGxHk6DWODqrgdbTIn
+/OHT/+TFUFQHU89YEZLfTb/MRSSKnhxcuOguH2KwL9aLAgMBAAGjWzBZMB0GA1Ud
+DgQWBBQGmSCSgZIUbOMnq6TS2JniITm0DTA4BgNVHREEMTAvggppZHAubWFoLnNl
+hiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAE6eWPoKTaZh/h1OufvNWObcvnJp9nmCsT6qHTQ3FRJ6VFKh/JSeqYlh
+a25i1dxjphMfNR/H9Bpj3eblaVKaKgywojh5X1jOevrvyrJui2Mdzoy/rTfSpe9/
+uScxEK65CIDkBj3xbzrILg/qV1uW1jUJivTvmAC97S3iEevYdDgWKXmhuYemoFfz
+JW+eSiJqXLxZ66LtzYpR006NkwmvGIiNklUXpSohW8Qli6fdQsN1jelLSg22kjKe
+LFzVBYxtNETAVdxLSeIJ8saBNAcs+PrZ/tDjWYwefkJGiOR/Sy1BmbR7H8itKAti
+jJU2WIS+eETI7AoMBvxYUdOwhHO9Uyc=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUZqSagQMfxaTdLMgiEq1DliWEF6swDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTBaFw0zNjAz
+MjIwODExNTBaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCg9MH6aHw3FTJimmv0pYtzdcN4Z1y00cGlbuFykg+G
+2lZWhp1nPTHmcX10NBs6zMDhw8tU/aoP0w0HbFYb8ybvVwQIJ70o5bYSZvUlaxjs
+WPjeGev3atiS2po1YbB0l0cjmZGc4WTXljoi11u8KbJKRd5oNzS+/bP9H3BA9MGU
+Zrw+9+1j53IEjlWSYOEpDfpcWimiKxTBauVWV+rTduC5XJqPIzlcOm248jojOP+c
+oot/aD67tw3EkPtMXAwA6gF3QaDf24YkSTTzkqGTgyykOZBWpykmLDm6VswEvVwb
+1TjdI6GTOJftTiqceySv+fyjypE+i8z7c2puHa8w25FVAgMBAAGjWzBZMB0GA1Ud
+DgQWBBS0AHl1i/xnxDcIta2EkFeRqpWZ1DA4BgNVHREEMTAvggppZHAubWFoLnNl
+hiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBACysMW88jYNzQNZK3BmPa2G3+U8wShjS6A4O9iVvFn20vKV0MZ2y13Lt
+PKbiLEK+Fp8ueRt6AHEdNRVMfq+YdzyuG9EDGqKKt1NEbfcG/JS2oWwTa/n9gzCc
+UE3r/3QIhBMi1ydR5a93F6bL8kQHm110COBSxA/y9n5rel6ybwhgQUGPWlfpV1CL
+74tDsem3BPOxFrznliM4yO31HORttr+idQU40p1J5QAFQkZHqnvW328vftAs3zCl
+t27XR73hJaFRoXZHtdbTkG386Q4u/nrLj5WSydSVRDkWUt0Cib52ft10Kz6bQtxg
+2l1TKCgfNmMiI8LLDq42FYLivsEaFAs=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAM5xFJJcWySFKJeIz/WavrXmbuhNMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwHhcNMTYwMzIyMDgxMTUwWhcNMzYw
+MzIyMDgxMTUwWjAVMRMwEQYDVQQDDAppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAmC0oViw/6krOFwoIf7M2PaGGvBmZnpNT4Jz8nI+f
+DyFGPC8cTUEnHPgLthCHS1aNzmkmlZ9jpK8eL2VBntEUbAYSK+6G9ual+jYjk/fH
+PpuR3e3J1a/JGEV+LgJziw+4j3O41aTcwt5l0ZBVtdON7pRTeTLfnEYJeoGlPJU7
+Gk9v/+BTo5peTtR2UZiOpgEs0OeNfiOt1RdaUndkQHbDc6aDdMgRwsbwQtLASvfr
+PDSWraERg1NFyK+BAUmIeEdq48um6KPIVkLMIPawgMV+uDYY9/E5GVm5V6+/CqiY
+ePkChMR6u5JaUQ70D0odk6i9SaGZUcwWJfoE9eTiwMo0yQIDAQABo1swWTAdBgNV
+HQ4EFgQUqqLsvn6tmlN7zYJ7Ea9h8psUF24wOAYDVR0RBDEwL4IKaWRwLm1haC5z
+ZYYhaHR0cHM6Ly9pZHAubWFoLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQA5rgvE5wFj20LbPOe7omwVROuTVUdpGbZ4XNWp6RDWx937xcJvJMFY
+mLBKhE3VtxyRDj+hwqnGgmeyEyYXBTPX7NNsibwOE0WcCcn4bshR6Gd5NvyQQ8w0
+Ybc+s9dLigZVWsOrMdednugV0mnqQ/qWwQYn7DBDHInReks2o+DtWyFhYeoSalch
+eMaU8y4Mq8Swi7X4ErzBD+DKFQe0q5aCaXIiwD+H4XJzOYkUxZSpAPW62lOgJAku
+Sb3rBCm5iyTFace5tFk069wtFHASk2Xy8atTMLx0nbFkq5eE/DVRsYj+C7QZOLTf
+7UutZmHR05RiErkouLWVildFWPkfDUIO
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ls00001.mah.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ls00001.mah.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ls00001.mah.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ls00001.mah.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ls00001.mah.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">mah.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUPrvA/P0+Dsrc50jusZnN26yth0cwDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTJaFw0zNjAz
+MjIwODExNTJaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCCYTQPJO3eMFyM1s95c9+L6GqieSDW421ziu+LKsau
+HGw1bYbSN/QFV//WSFu7kVTXOlyHw7oCKOCPAsnAeZwO7ulFjL7XbmsXgUhC7Zce
+A7lHXakjMoLXGTbz07xPRjhjLs31TG6wfQBwec5aot+yfRmuy2ag+DOWCQDvVND5
+PDgdH7MNURiJD0POpaPv/w1PNm55hpqxxAQpXrn6KZuUdLtihWQKsK0UeEEf52Pi
+9dlrVnDArIredcnDA8uQz578Ve/JgmJYlRfhMa2XKGkz8IwGxHk6DWODqrgdbTIn
+/OHT/+TFUFQHU89YEZLfTb/MRSSKnhxcuOguH2KwL9aLAgMBAAGjWzBZMB0GA1Ud
+DgQWBBQGmSCSgZIUbOMnq6TS2JniITm0DTA4BgNVHREEMTAvggppZHAubWFoLnNl
+hiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAE6eWPoKTaZh/h1OufvNWObcvnJp9nmCsT6qHTQ3FRJ6VFKh/JSeqYlh
+a25i1dxjphMfNR/H9Bpj3eblaVKaKgywojh5X1jOevrvyrJui2Mdzoy/rTfSpe9/
+uScxEK65CIDkBj3xbzrILg/qV1uW1jUJivTvmAC97S3iEevYdDgWKXmhuYemoFfz
+JW+eSiJqXLxZ66LtzYpR006NkwmvGIiNklUXpSohW8Qli6fdQsN1jelLSg22kjKe
+LFzVBYxtNETAVdxLSeIJ8saBNAcs+PrZ/tDjWYwefkJGiOR/Sy1BmbR7H8itKAti
+jJU2WIS+eETI7AoMBvxYUdOwhHO9Uyc=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUZqSagQMfxaTdLMgiEq1DliWEF6swDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTBaFw0zNjAz
+MjIwODExNTBaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCg9MH6aHw3FTJimmv0pYtzdcN4Z1y00cGlbuFykg+G
+2lZWhp1nPTHmcX10NBs6zMDhw8tU/aoP0w0HbFYb8ybvVwQIJ70o5bYSZvUlaxjs
+WPjeGev3atiS2po1YbB0l0cjmZGc4WTXljoi11u8KbJKRd5oNzS+/bP9H3BA9MGU
+Zrw+9+1j53IEjlWSYOEpDfpcWimiKxTBauVWV+rTduC5XJqPIzlcOm248jojOP+c
+oot/aD67tw3EkPtMXAwA6gF3QaDf24YkSTTzkqGTgyykOZBWpykmLDm6VswEvVwb
+1TjdI6GTOJftTiqceySv+fyjypE+i8z7c2puHa8w25FVAgMBAAGjWzBZMB0GA1Ud
+DgQWBBS0AHl1i/xnxDcIta2EkFeRqpWZ1DA4BgNVHREEMTAvggppZHAubWFoLnNl
+hiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBACysMW88jYNzQNZK3BmPa2G3+U8wShjS6A4O9iVvFn20vKV0MZ2y13Lt
+PKbiLEK+Fp8ueRt6AHEdNRVMfq+YdzyuG9EDGqKKt1NEbfcG/JS2oWwTa/n9gzCc
+UE3r/3QIhBMi1ydR5a93F6bL8kQHm110COBSxA/y9n5rel6ybwhgQUGPWlfpV1CL
+74tDsem3BPOxFrznliM4yO31HORttr+idQU40p1J5QAFQkZHqnvW328vftAs3zCl
+t27XR73hJaFRoXZHtdbTkG386Q4u/nrLj5WSydSVRDkWUt0Cib52ft10Kz6bQtxg
+2l1TKCgfNmMiI8LLDq42FYLivsEaFAs=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAM5xFJJcWySFKJeIz/WavrXmbuhNMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwHhcNMTYwMzIyMDgxMTUwWhcNMzYw
+MzIyMDgxMTUwWjAVMRMwEQYDVQQDDAppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAmC0oViw/6krOFwoIf7M2PaGGvBmZnpNT4Jz8nI+f
+DyFGPC8cTUEnHPgLthCHS1aNzmkmlZ9jpK8eL2VBntEUbAYSK+6G9ual+jYjk/fH
+PpuR3e3J1a/JGEV+LgJziw+4j3O41aTcwt5l0ZBVtdON7pRTeTLfnEYJeoGlPJU7
+Gk9v/+BTo5peTtR2UZiOpgEs0OeNfiOt1RdaUndkQHbDc6aDdMgRwsbwQtLASvfr
+PDSWraERg1NFyK+BAUmIeEdq48um6KPIVkLMIPawgMV+uDYY9/E5GVm5V6+/CqiY
+ePkChMR6u5JaUQ70D0odk6i9SaGZUcwWJfoE9eTiwMo0yQIDAQABo1swWTAdBgNV
+HQ4EFgQUqqLsvn6tmlN7zYJ7Ea9h8psUF24wOAYDVR0RBDEwL4IKaWRwLm1haC5z
+ZYYhaHR0cHM6Ly9pZHAubWFoLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQA5rgvE5wFj20LbPOe7omwVROuTVUdpGbZ4XNWp6RDWx937xcJvJMFY
+mLBKhE3VtxyRDj+hwqnGgmeyEyYXBTPX7NNsibwOE0WcCcn4bshR6Gd5NvyQQ8w0
+Ybc+s9dLigZVWsOrMdednugV0mnqQ/qWwQYn7DBDHInReks2o+DtWyFhYeoSalch
+eMaU8y4Mq8Swi7X4ErzBD+DKFQe0q5aCaXIiwD+H4XJzOYkUxZSpAPW62lOgJAku
+Sb3rBCm5iyTFace5tFk069wtFHASk2Xy8atTMLx0nbFkq5eE/DVRsYj+C7QZOLTf
+7UutZmHR05RiErkouLWVildFWPkfDUIO
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ls00001.mah.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">MAH</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Malmö högskola *TEST*</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Malmö University *TEST*</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.mah.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Malmö University</Company>
+    <SurName>IT Drift</SurName>
+    <EmailAddress>mailto:drift@mah.se</EmailAddress>
+    <TelephoneNumber>+46 709 655480</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>Malmö University</Company>
+    <SurName>Robert Faling</SurName>
+    <EmailAddress>mailto:robert.faling@mah.se</EmailAddress>
+    <TelephoneNumber>+46 768 428753</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Malmö University</Company>
+    <SurName>Servicedesk Malmö högskola</SurName>
+    <EmailAddress>mailto:support@mah.se</EmailAddress>
+    <TelephoneNumber>+46 40 6657555</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/ludwig.lub.lu.se-sp.xml b/swamid-2.0/ludwig.lub.lu.se-sp.xml
index fe9a7387..3f164b39 100644
--- a/swamid-2.0/ludwig.lub.lu.se-sp.xml
+++ b/swamid-2.0/ludwig.lub.lu.se-sp.xml
@@ -20,7 +20,7 @@
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate> 
+          <ds:X509Certificate>
 MIIELzCCAxegAwIBAgIBCjANBgkqhkiG9w0BAQsFADByMR8wHQYDVQQDExZsb2dp 
 bi5sdWR3aWcubHViLmx1LnNlMQswCQYDVQQGEwJTRTEgMB4GA1UEChMXTHVuZCBV 
 bml2ZXJzaXR5IExpYnJhcnkxIDAeBgkqhkiG9w0BCQEWEWJkLXRlY2hAbHViLmx1 
diff --git a/swamid-2.0/luvittest.ced.lu.se-shibboleth.xml b/swamid-2.0/luvittest.ced.lu.se-shibboleth.xml
index 2fa9212b..73824107 100644
--- a/swamid-2.0/luvittest.ced.lu.se-shibboleth.xml
+++ b/swamid-2.0/luvittest.ced.lu.se-shibboleth.xml
@@ -85,7 +85,7 @@ OTMXxdAawBca6aO1CpUMAwipgLVKJyNkmxV7+aPSdkp/U466LROEWhraZg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://luvittest.ced.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="technical">
-    <md:GivenName> Peter Nilsson</md:GivenName>
+    <md:GivenName>Peter Nilsson</md:GivenName>
     <md:EmailAddress>peter.nilsson@grade.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/passportprod.lu.se-activateaccount-shibboleth.xml b/swamid-2.0/passportprod.lu.se-activateaccount-shibboleth.xml
index 10858c77..ce263599 100644
--- a/swamid-2.0/passportprod.lu.se-activateaccount-shibboleth.xml
+++ b/swamid-2.0/passportprod.lu.se-activateaccount-shibboleth.xml
@@ -36,9 +36,9 @@
         <mdui:Description xml:lang="en">Administration and activating accounts</mdui:Description>
         <mdui:Description xml:lang="sv">Administration och aktivering av konton</mdui:Description>
         <mdui:Logo height="78" width="350">http://www.lunduniversity.lu.se/sites/www.lunduniversity.lu.se/files/lund_university_logotype.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="78" width="350"> http://www.lu.se/sites/www.lu.se/files/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="78" width="350">http://www.lu.se/sites/www.lu.se/files/logo.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">https://passportprod.lu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv"> https://passportprod.lu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://passportprod.lu.se</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/passporttest.lu.se-activateaccount-shibboleth.xml b/swamid-2.0/passporttest.lu.se-activateaccount-shibboleth.xml
index 602381a0..6472c1f0 100644
--- a/swamid-2.0/passporttest.lu.se-activateaccount-shibboleth.xml
+++ b/swamid-2.0/passporttest.lu.se-activateaccount-shibboleth.xml
@@ -36,9 +36,9 @@
         <mdui:Description xml:lang="en">As a new user you use this service to activate your university user account.</mdui:Description>
         <mdui:Description xml:lang="sv">Denna tjänst används för att du som ny vid universitetet ska kunna aktivera ditt användarkonto vid universitetet.</mdui:Description>
         <mdui:Logo height="50" width="50">http://www.lunduniversity.lu.se/sites/www.lunduniversity.lu.se/files/lund_university_logotype.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="50" width="50"> http://www.lu.se/sites/www.lu.se/files/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="50">http://www.lu.se/sites/www.lu.se/files/logo.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">https://passporttest.lu.se/activateaccount</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv"> https://passporttest.lu.se/activateaccount</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://passporttest.lu.se/activateaccount</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 5352431d..a0f87309 100644
--- a/swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -7,9 +7,9 @@
         <mdui:DisplayName xml:lang="en">Preklin på Uppsala University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Administration av inbjudningar för firande av läkarprogrammets första fyra terminer på Uppsala universitet</mdui:Description>
         <mdui:Description xml:lang="en">Adminstration of guest invites for the student celebration for completion of the first four semesters at the medicine program at Uppsala University</mdui:Description>
-        <mdui:Logo height="50" width="50"> https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv"> https://www.preklin.nu/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en"> https://www.preklin.nu/</mdui:InformationURL>
+        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://www.preklin.nu/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.preklin.nu/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml b/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
index 32fd229c..d1b659c8 100644
--- a/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
+++ b/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
@@ -16,9 +16,9 @@
         <mdui:DisplayName xml:lang="en">Uppsala University Primula</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Uppsala universitets personalsystem Primula</mdui:Description>
         <mdui:Description xml:lang="en">Uppsala University HR system Primula</mdui:Description>
-        <mdui:Logo height="50" width="50"> https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv"> https://primulaweb.uadm.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en"> https://primulaweb.uadm.uu.se</mdui:InformationURL>
+        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://primulaweb.uadm.uu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://primulaweb.uadm.uu.se</mdui:InformationURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
diff --git a/swamid-2.0/scalear-saml.herokuapp.com.xml b/swamid-2.0/scalear-saml.herokuapp.com.xml
index 5ec752f7..5a61fc2f 100644
--- a/swamid-2.0/scalear-saml.herokuapp.com.xml
+++ b/swamid-2.0/scalear-saml.herokuapp.com.xml
@@ -12,8 +12,8 @@
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Scalable Learning</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education. </mdui:Description>
-        <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </mdui:Description>
+        <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education.</mdui:Description>
+        <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://www.scalable-learning.com/home/about</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.scalable-learning.com/home/privacy</mdui:PrivacyStatementURL>
         <mdui:Logo height="100" width="100">https://scalear-saml.herokuapp.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
diff --git a/swamid-2.0/scalear-staging2.herokuapp.com.xml b/swamid-2.0/scalear-staging2.herokuapp.com.xml
index a473a028..19b8d04c 100644
--- a/swamid-2.0/scalear-staging2.herokuapp.com.xml
+++ b/swamid-2.0/scalear-staging2.herokuapp.com.xml
@@ -4,7 +4,7 @@
     <mdattr:EntityAttributes>
       <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
-        <saml:AttributeValue> http://www.swamid.se/category/research-and-education</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/se.timeedit.net-kau-employee-sp.xml b/swamid-2.0/se.timeedit.net-kau-employee-sp.xml
new file mode 100644
index 00000000..32becd50
--- /dev/null
+++ b/swamid-2.0/se.timeedit.net-kau-employee-sp.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://se.timeedit.net/kau-employee-sp">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.o rg/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="false">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">TimeEdit för studenter vid Karlstads universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TimeEdit for students at Karlstad University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">TimeEdit, utvecklat av TimeEdit AB</mdui:Description>
+        <mdui:Description xml:lang="en">TimeEdit, developed by TimeEdit AB</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDcDCCAlgCCQDVKUGzGrt/2jANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJTRTEYMBYGA1UE
+CAwPVmFzdHJhIGdvdGFsYW5kMRMwEQYDVQQHDApHb3RoZW5idXJnMRQwEgYDVQQKDAtUaW1lRWRp
+dCBBQjELMAkGA1UECwwCSVQxGTAXBgNVBAMMEGF1dGgudGltZWVkaXQuc2UwHhcNMTUwNjE1MTAw
+MjEzWhcNMjUwNjEyMTAwMjEzWjB6MQswCQYDVQQGEwJTRTEYMBYGA1UECAwPVmFzdHJhIGdvdGFs
+YW5kMRMwEQYDVQQHDApHb3RoZW5idXJnMRQwEgYDVQQKDAtUaW1lRWRpdCBBQjELMAkGA1UECwwC
+SVQxGTAXBgNVBAMMEGF1dGgudGltZWVkaXQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCgv6XIGV5MzRQbAY8tc9x8Eyuiac+o/z6qUT6s6zSYRu83Jd0RZPRnk/9egxV8RElBDq/k
+MAkXhzejUGI+yFkvxyPpB0u4lct9U0a7mbOr+UqkH+ffxjhxZjEjI20FxX29woMhFRtA//bucQ8y
+xuzYhoJd/pXeXfJCpvKZlPJ3ycF9lkUb3nMMoFNIPlRDddb4tu+MpJljioOPIWR45+PyRXKW1ZMd
+Ey8pMoYt42sbIIWJoxj+9/IDbaA7LPg7Zxj+ioWzz7zYA6zdKLj54aQUCrcJ0RZIThzr2gOvMRaT
+5sqDHDmrKFZD/Xd6HwCJkwN6qFPurfZG2GoSnwZ/A8zVAgMBAAEwDQYJKoZIhvcNAQELBQADggEB
+ADv6hhEsCrpbERGv6rFlEvHmYtYrjgJBLF3a91PIvVGPENI6HwJhsges/5idijAIcJyeItd0+UAf
+eTCMriyNnrqfOdOMaHMC+OXcS1+SV+ZLY6SlAWUzbNlwCTyjETfteMEX70fcKIT+Suv+4nA1ZS9o
+g3y728pny0W+yhYxgjs7mSfG2XZIjzV53qGqCscLu8ASWmlSsqtiUfGueWAfGWHEVDDIr95IMy/u
+TG/lyQTEzr6BTeWusqhm6UXKHguQTvdcpUfH+n4L34gCi0CwMcSfyeRecYdLYPbWKAksD570x5Rd
+YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://se.timeedit.net/web/kau/db1/timeedit/ssoLogout/personal_saml2"/>
+    <md:NameIDFormat>urn:oasis:names: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" isDefault="false" index="0" Location="https://se.timeedit.net/web/kau/db1/timeedit/ssoResponse/personal_saml2"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>TimeEdit</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-kau-student-sp.xml b/swamid-2.0/se.timeedit.net-kau-student-sp.xml
new file mode 100644
index 00000000..88edafd6
--- /dev/null
+++ b/swamid-2.0/se.timeedit.net-kau-student-sp.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://se.timeedit.net/kau-student-sp">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.o rg/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="false">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">TimeEdit för studenter vid Karlstads universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TimeEdit for students at Karlstad University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">TimeEdit, utvecklat av TimeEdit AB</mdui:Description>
+        <mdui:Description xml:lang="en">TimeEdit, developed by TimeEdit AB</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDcDCCAlgCCQDVKUGzGrt/2jANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJTRTEYMBYGA1UE
+CAwPVmFzdHJhIGdvdGFsYW5kMRMwEQYDVQQHDApHb3RoZW5idXJnMRQwEgYDVQQKDAtUaW1lRWRp
+dCBBQjELMAkGA1UECwwCSVQxGTAXBgNVBAMMEGF1dGgudGltZWVkaXQuc2UwHhcNMTUwNjE1MTAw
+MjEzWhcNMjUwNjEyMTAwMjEzWjB6MQswCQYDVQQGEwJTRTEYMBYGA1UECAwPVmFzdHJhIGdvdGFs
+YW5kMRMwEQYDVQQHDApHb3RoZW5idXJnMRQwEgYDVQQKDAtUaW1lRWRpdCBBQjELMAkGA1UECwwC
+SVQxGTAXBgNVBAMMEGF1dGgudGltZWVkaXQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCgv6XIGV5MzRQbAY8tc9x8Eyuiac+o/z6qUT6s6zSYRu83Jd0RZPRnk/9egxV8RElBDq/k
+MAkXhzejUGI+yFkvxyPpB0u4lct9U0a7mbOr+UqkH+ffxjhxZjEjI20FxX29woMhFRtA//bucQ8y
+xuzYhoJd/pXeXfJCpvKZlPJ3ycF9lkUb3nMMoFNIPlRDddb4tu+MpJljioOPIWR45+PyRXKW1ZMd
+Ey8pMoYt42sbIIWJoxj+9/IDbaA7LPg7Zxj+ioWzz7zYA6zdKLj54aQUCrcJ0RZIThzr2gOvMRaT
+5sqDHDmrKFZD/Xd6HwCJkwN6qFPurfZG2GoSnwZ/A8zVAgMBAAEwDQYJKoZIhvcNAQELBQADggEB
+ADv6hhEsCrpbERGv6rFlEvHmYtYrjgJBLF3a91PIvVGPENI6HwJhsges/5idijAIcJyeItd0+UAf
+eTCMriyNnrqfOdOMaHMC+OXcS1+SV+ZLY6SlAWUzbNlwCTyjETfteMEX70fcKIT+Suv+4nA1ZS9o
+g3y728pny0W+yhYxgjs7mSfG2XZIjzV53qGqCscLu8ASWmlSsqtiUfGueWAfGWHEVDDIr95IMy/u
+TG/lyQTEzr6BTeWusqhm6UXKHguQTvdcpUfH+n4L34gCi0CwMcSfyeRecYdLYPbWKAksD570x5Rd
+YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://se.timeedit.net/web/kau/db1/timeedit/ssoLogout/student_saml2"/>
+    <md:NameIDFormat>urn:oasis:names: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" isDefault="false" index="0" Location="https://se.timeedit.net/web/kau/db1/timeedit/ssoResponse/student_saml2"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>TimeEdit</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/secure.port.se-shibboleth.xml b/swamid-2.0/secure.port.se-shibboleth.xml
index 2147c304..f738467e 100644
--- a/swamid-2.0/secure.port.se-shibboleth.xml
+++ b/swamid-2.0/secure.port.se-shibboleth.xml
@@ -34,8 +34,8 @@ Metadata Nordic Port prod environment
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">KLARA</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">KLARA</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">KLARA är ett webbaserat system med syfte att inventera, sammanställa, visa och följa upp information om kemikalier och kemiska produkter som hanteras av en organisation.  Systemet skall även fungera som ett informationssystem till alla som hanterar kemikalier i organisationen.  Med hjälp av KLARA kan man enkelt få svar på frågor som rör den egna verksamhetens hantering av kemikalier </mdui:Description>
-        <mdui:Description xml:lang="en">KLARA is a web based system with the purpose of making it easier and more time efficient for management and staff to make inventories, compile, view and follow up information about chemicals and chemical products which are used by the organisation in a cost effective way.  KLARA serve as an information system to all who handle chemicals within your organisation.  KLARA allows you to control and monitor all of your organisation's chemical usage in detail. </mdui:Description>
+        <mdui:Description xml:lang="sv">KLARA är ett webbaserat system med syfte att inventera, sammanställa, visa och följa upp information om kemikalier och kemiska produkter som hanteras av en organisation.  Systemet skall även fungera som ett informationssystem till alla som hanterar kemikalier i organisationen.  Med hjälp av KLARA kan man enkelt få svar på frågor som rör den egna verksamhetens hantering av kemikalier</mdui:Description>
+        <mdui:Description xml:lang="en">KLARA is a web based system with the purpose of making it easier and more time efficient for management and staff to make inventories, compile, view and follow up information about chemicals and chemical products which are used by the organisation in a cost effective way.  KLARA serve as an information system to all who handle chemicals within your organisation.  KLARA allows you to control and monitor all of your organisation's chemical usage in detail.</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/sesam.uu.se-shibboleth.xml b/swamid-2.0/sesam.uu.se-shibboleth.xml
index a5b2e52d..13c21300 100644
--- a/swamid-2.0/sesam.uu.se-shibboleth.xml
+++ b/swamid-2.0/sesam.uu.se-shibboleth.xml
@@ -17,8 +17,8 @@
         <mdui:Description xml:lang="sv">Uppsala Universitets Sesam administration av passagerättigheter</mdui:Description>
         <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:InformationURL xml:lang="en"> https://sesam.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv"> https://sesam.uu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://sesam.uu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://sesam.uu.se</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml b/swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml
index 7593c32b..e322ea83 100644
--- a/swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml
+++ b/swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml
@@ -27,10 +27,10 @@
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv"> PING PONG vid Sophiahemmet högskola </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en"> PING PONG at Sophiahemmet University </mdui:DisplayName>
-        <mdui:Description xml:lang="sv"> Lärplattformen PING PONG vid Sophiahemmet högskola. </mdui:Description>
-        <mdui:Description xml:lang="en"> The learning platform PING PONG at Sophiahemmet University. </mdui:Description>
+        <mdui:DisplayName xml:lang="sv">PING PONG vid Sophiahemmet högskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">PING PONG at Sophiahemmet University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Lärplattformen PING PONG vid Sophiahemmet högskola.</mdui:Description>
+        <mdui:Description xml:lang="en">The learning platform PING PONG at Sophiahemmet University.</mdui:Description>
         <mdui:Logo height="168" width="50">https://shh.pingpong.se/login/pingpong-logo-168x50.png</mdui:Logo>
         <mdui:Logo height="16" width="16">https://shh.pingpong.se/login/pingpong-logo-16x16.png</mdui:Logo>
       </mdui:UIInfo>
diff --git a/swamid-2.0/sp-utv.ldc.lu.se-shibboleth.xml b/swamid-2.0/sp-utv.ldc.lu.se-shibboleth.xml
index d2e439c5..5d529029 100644
--- a/swamid-2.0/sp-utv.ldc.lu.se-shibboleth.xml
+++ b/swamid-2.0/sp-utv.ldc.lu.se-shibboleth.xml
@@ -24,7 +24,7 @@
       <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://sp-utv.ldc.lu.se/Shibboleth.sso/Login-lu"/>
       <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://sp-utv.ldc.lu.se/Shibboleth.sso/Login-swamid" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Utvecklings-SP LDC </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Utvecklings-SP LDC</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Development SP LDC</mdui:DisplayName>
         <mdui:Description xml:lang="sv">SP använd under utveckling av verktygsstöd riktade mot utbildning och forskning vid Lunds universitet.</mdui:Description>
         <mdui:Description xml:lang="en">SP used for development of applications for education and reasearch at Lund university.</mdui:Description>
diff --git a/swamid-2.0/student.ate.grayzone.ladok.se-student-sp.xml b/swamid-2.0/student.ate.grayzone.ladok.se-student-sp.xml
new file mode 100644
index 00000000..cda6b480
--- /dev/null
+++ b/swamid-2.0/student.ate.grayzone.ladok.se-student-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://student.ate.grayzone.ladok.se/student-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla: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://student.ate.grayzone.ladok.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://student.ate.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok student.ate.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student.ate.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://student.ate.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://student.ate.grayzone.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.ate.grayzone.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.ate.grayzone.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAKC5PITj5X4eMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
+BAMTHXN0dWRlbnQuYXRlLmdyYXl6b25lLmxhZG9rLnNlMB4XDTE2MDMxNDExMDcw
+OFoXDTI2MDMxMjExMDcwOFowKDEmMCQGA1UEAxMdc3R1ZGVudC5hdGUuZ3JheXpv
+bmUubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrFS48
+pppSmK8vQdXPbk5Y0PAqw9/b5I/zROFFYQ7xpH/Qi5YKkT0fMEkzUL5Ymq7KKCV0
+sDAp6KtKZPP7TVMpr9mV6SsFL78T8TCIGiHnoomrbgspoocLxj5rW08shUCyS0gs
+88n4+s5HxQ8mkU3DlzsBa3RujKQiMkIDqtW8E7GzUNgVwKpHucjcWDVDMrhyMSHJ
+axX/gvIWywlo0+WeA+WrBWb4W/kkO51LRv+P3hAr7oFEsSHdWPEJTQqc6PMj8fpy
+gzGM6P/K7N8N4l3eBbPiS2DbvUfeS3ovc/SHWRFpd6Z659lsNI4/kSemA/Iecekf
+gtj27lvJYByhl55RAgMBAAGjeTB3MFYGA1UdEQRPME2CHXN0dWRlbnQuYXRlLmdy
+YXl6b25lLmxhZG9rLnNlhixodHRwczovL3N0dWRlbnQuYXRlLmdyYXl6b25lLmxh
+ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUB5dYMRo/rrKcf8mXKl/rrEeeSfQwDQYJ
+KoZIhvcNAQELBQADggEBAAPbPOcXeEEeb/qOOrOZa2uotrOx7md3jRkNQKqqy7nb
+T2kz//aJtct1GLhtlGHn1DnR5qZDJG1tSVvcG8dXHEZu+xXmHOtUKYnypD8JN+rj
+Upeo2MsSi1quGylaBmpJq1eB0X3CGRbfvBuiCiVFenPVot94z83Q/o7q8y3+mX28
+6ot0IZxzDEtLJi7BoV0mZWGXMQXNWG4avQld6XAxNC66MjOz0Up6tt7Mxxo0rmNM
+Q17iTUEcXA3MhSQ9twmRjjixtrjs38qZrYAbmvhPilTQ5vLGeRaeErY2ac/Pm2s/
+P85hD9Nccqj+TOPIJFB7fd6AoUGxjHQCi4yD3nqZ0vc=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/student.ate.ladok.se-student-sp.xml b/swamid-2.0/student.ate.ladok.se-student-sp.xml
new file mode 100644
index 00000000..c729427f
--- /dev/null
+++ b/swamid-2.0/student.ate.ladok.se-student-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://student.ate.ladok.se/student-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla: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://student.ate.ladok.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://student.ate.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok student.ate.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student.ate.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://student.ate.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://student.ate.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.ate.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.ate.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJAPGA6tzcgNkTMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
+BAMTFHN0dWRlbnQuYXRlLmxhZG9rLnNlMB4XDTE2MDMxNDEzMDMyN1oXDTI2MDMx
+MjEzMDMyN1owHzEdMBsGA1UEAxMUc3R1ZGVudC5hdGUubGFkb2suc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKyIfQtdq2FrR8qsthGDMXmaFHZ/Ge
+bpjOO6YMeNpIP3U8QceGuMWWLkgweeci78hkFZ/zni1WNF5V0zhMTLGrRs+ASHpM
++BqYM5Xf6OIyKTuUOMhaJnQY55HPNy5SWB3pZLi/8WP7QWL6wkZSOJTtwvjHz8vu
+Wy+0qVx//LSul6BFIEOMMfc6NJGg3KT91n8Fs3kxZcawiyuJiO7O9pCdbOG0RXW3
+ipIOZzv/YjC7Cb0e3kea1ED37TO4I8AxwVKpkhqNlZoRONY439NGqG21e+Oqrogs
+hFy7g35Irf4c/EizrTah+bZtlPzxi11GN7AeBzDucj4IfnPg4WEfqOydAgMBAAGj
+ZzBlMEQGA1UdEQQ9MDuCFHN0dWRlbnQuYXRlLmxhZG9rLnNlhiNodHRwczovL3N0
+dWRlbnQuYXRlLmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUCS6vUkUfFHEL0Vjp
+2qWovVeYakwwDQYJKoZIhvcNAQELBQADggEBAFeXHEuJgAFOa9Iq1WhDXzmcv6BG
+pQYZLrHS9LCXL1fhVK/9yr3T0/vB3yyovt+poihL+LOTauVvpR64GQOYbwoQmoMr
+8XySdGBhTol5B/jnBRiRuWMOMtJ5P+Bs/BqGb2tpyFjgujIJoH67k2C7mIbqef+4
+1livYsr6oZqYqCM7p7I1e7ZrD23Izt9t/xfRB1rWwqrhyDSJIOSdkJihcv9tty71
+kGZl4+dk2BsiU3oulvfww5KhVbMYttnmm+4N4Gh4Sc8/xNM2TEuLZY+1AsZGh5RW
+KrMJx6CX82Vpnibn2PQZsp52iXVQN/95m3Cx3Oq2Cj+cYpfNQHPcSdSET5s=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ate.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ate.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ate.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ate.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ate.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ate.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ate.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ate.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ate.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ate.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ate.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.ate.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.ate.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.ate.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/student.cvt.grayzone.ladok.se-student-sp.xml b/swamid-2.0/student.cvt.grayzone.ladok.se-student-sp.xml
new file mode 100644
index 00000000..6f193f1b
--- /dev/null
+++ b/swamid-2.0/student.cvt.grayzone.ladok.se-student-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://student.cvt.grayzone.ladok.se/student-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla: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://student.cvt.grayzone.ladok.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://student.cvt.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok student.cvt.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student.cvt.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://student.cvt.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://student.cvt.grayzone.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.cvt.grayzone.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.cvt.grayzone.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAOpgFVuQUtH6MA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
+BAMTHXN0dWRlbnQuY3Z0LmdyYXl6b25lLmxhZG9rLnNlMB4XDTE2MDMyMzA4Mzgw
+MVoXDTI2MDMyMTA4MzgwMVowKDEmMCQGA1UEAxMdc3R1ZGVudC5jdnQuZ3JheXpv
+bmUubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH+h1/
+Brzmj+s08QwYM4l5O0818VgVL2c/V9BT4vEtB0KBcHg6ZJ6BDTNbW23MlEi3lhIx
+/x37n8itZoaN5oXpr1skEPhtEE7aeCclMhPE/o7N1VaFC0XJODqQ8Je6Z1lrCC9y
+CGW8/UaG4vNm5dMe2fJRUnsUi2eXvNUHW38lY6Qy5h7fu1v0/3xOc4bmz15gno7L
+LV6XgHTrlQ0AUqksZXwjjWROT+gg2XY/iW4agpd2ToTmA8w/4a3i9c+AD9XDXIiP
+l8dAE9eoGi3oFcw6xMZcDgEnZ2SRXdl47Xv3v1KnHaebcpdh4GntjQ3KfQwZ0K3V
+eBkHZKkC66Tplq5bAgMBAAGjeTB3MFYGA1UdEQRPME2CHXN0dWRlbnQuY3Z0Lmdy
+YXl6b25lLmxhZG9rLnNlhixodHRwczovL3N0dWRlbnQuY3Z0LmdyYXl6b25lLmxh
+ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUJ6BsYHxsMlx/dFr2rU1C8IF6zpUwDQYJ
+KoZIhvcNAQELBQADggEBADUU/h/13o5Rx3dQ20A/QePdoDYOSGSg7uuIvu+clP/q
+Yofp52zdyBy8xvDXJHjSuxLQUCSBMDGcUpiQBLdgT5AMoO634HXMbNx9Wg/u80Q4
+wJVVNLthWkr6yoW4f3uMYPlvKv6uxZDsjpFVcDmrJEG/isTcM2hKnLIRkqhfz0R0
+hM4d4hmp66jbA+rR4quZc06JDk9GQtfHKpd0e/E2m1icZ0iXNQoR3nWhy43w8/1F
+Q6FEQILyrefMbTyzMrZLAwVrrdUj4CGKUT5trlYz+7oxmfIdevj3BoxeJJCbUIRS
+Eaa85NvpzKUAXe6s3r7I7NqyPBiZqlys09ihK5QDjG8=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/student.cvt.ladok.se-student-sp.xml b/swamid-2.0/student.cvt.ladok.se-student-sp.xml
new file mode 100644
index 00000000..20d1551b
--- /dev/null
+++ b/swamid-2.0/student.cvt.ladok.se-student-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://student.cvt.ladok.se/student-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla: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://student.cvt.ladok.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://student.cvt.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok student.cvt.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student.cvt.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://student.cvt.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://student.cvt.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.cvt.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.cvt.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJAMQUFu9hRBbAMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
+BAMTFHN0dWRlbnQuY3Z0LmxhZG9rLnNlMB4XDTE2MDMxNDEyNTA1NloXDTI2MDMx
+MjEyNTA1NlowHzEdMBsGA1UEAxMUc3R1ZGVudC5jdnQubGFkb2suc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCww6s8AXukNEe9sqmdKPAhqGagAiil
+9X0OLI11+zM/ZNDqgPVp/PkazpsyhTjZ75KZd7PycPDg0QSvA0c5mfJ3LzjXSo6H
+1wgK8s4Co9qw9+iuYe0+IIo0AzyywROmyocwe4Ogcmgyhfkk0GlH4sUrubsEYGF5
+zjXoIPqQeSGX0iRu6OLatytrYW5G+2sfDiLvjIx6WyCRofqxGpw0UFnqzshgCqf+
+MF5yhUYb9bL3Z+n0g438pAJWB8SHMo7SF5E8Io3jBEt+TFZcKX8Btue3MSFKWE3V
+OggyHqC/YJDrKwMbplpf33149Xya7qsVHGfGn1vHGEV9qHcDAfzb2iHJAgMBAAGj
+ZzBlMEQGA1UdEQQ9MDuCFHN0dWRlbnQuY3Z0LmxhZG9rLnNlhiNodHRwczovL3N0
+dWRlbnQuY3Z0LmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUzNibcuI91UxXPtL7
+if8DRHxDVVowDQYJKoZIhvcNAQELBQADggEBAJbKjPVaGpzIPzy3qSPibIFE9kQK
+8+6gdhfvOT7uDKMXFJl5wHYhdlJdQwGDVLZ0ypKDDhKy604de4CaxcguBx1SyAMm
+tCmca7YcLOZsWzzXs56hkl1wGsbCaBWQ+B5I+ekF7rQo8jr2ET5p8hlTjjdLf01S
+GYTN1IiSlcwmRQfd6DXrO+2BOrsBf7jytPeoyy4A3YEfsP/jwtdbyAEjm2Nn6gkZ
+XKD0jhIk+fkRgCXvqtT4sIusZaziRdmhXKI/WAL/r5XL3SsE7knFtBTU0U+02grq
+sT5JHJ3U9r/brdGPiSt7y0rUeDe3+ChZjBUlfQ4z/NlOdMwX93/2zTk+qYc=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.cvt.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.cvt.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.cvt.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.cvt.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.cvt.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.cvt.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.cvt.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.cvt.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.cvt.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.cvt.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.cvt.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.cvt.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.cvt.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.cvt.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/student.ete.grayzone.ladok.se-student-sp.xml b/swamid-2.0/student.ete.grayzone.ladok.se-student-sp.xml
new file mode 100644
index 00000000..0aaefabf
--- /dev/null
+++ b/swamid-2.0/student.ete.grayzone.ladok.se-student-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://student.ete.grayzone.ladok.se/student-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla: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://student.ete.grayzone.ladok.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://student.ete.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok student.ete.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student.ete.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://student.ete.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://student.ete.grayzone.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.ete.grayzone.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.ete.grayzone.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAM9TZ3bJgRSnMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
+BAMTHXN0dWRlbnQuZXRlLmdyYXl6b25lLmxhZG9rLnNlMB4XDTE2MDMxNDEyMTky
+MloXDTI2MDMxMjEyMTkyMlowKDEmMCQGA1UEAxMdc3R1ZGVudC5ldGUuZ3JheXpv
+bmUubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrGglc
+qjEsQ/2l3R85R++FVQCh14u1PViCWv/0JnTzwY/St1ZlLlLGE7m6OmEBUus4CL2N
+/HYJ0CUzUQCIHZyOlr9aPFd7QESvCqN2jY1VLzJZib4snNU4E4mMwD4G3gPJFLZN
+9VUQ/tLe1/rarpWJT8+YJsriMooH9s1MnmCwq+qTZ1UWNcqy5HGl9SfgfLXGNlLx
+fMrU0qT1cbw6QqMvb8piqa5Nh+UbkYnTkVkkvw0qt0gg11zmW8h4m9UJ+16FzdBh
+VMxDEf3GYiOYF+/vNqcBYUM6bbUQZC8vDawHzi8QLWUyNSoC697M1CXUZxN2napX
+7eWDHFRO5S2Mdwz1AgMBAAGjeTB3MFYGA1UdEQRPME2CHXN0dWRlbnQuZXRlLmdy
+YXl6b25lLmxhZG9rLnNlhixodHRwczovL3N0dWRlbnQuZXRlLmdyYXl6b25lLmxh
+ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUGTot6nFf4oASiKcWzhx14GAXxGcwDQYJ
+KoZIhvcNAQELBQADggEBAElk+35EkGf0cnnmvvWX4fSURP951DAhBMIZUvjRUbr6
+yFB87ks7qRZtWVnU21DY8TPexjW+z1FXxbjaK291IHf1Q3PsTtJxM7TYxuhQfTZC
+yS5mTLvbctumSGkBdoCcoYjt32hc0Z55uid7Q3fTuYAyM5aWXwaKLc6xtnhj/SVs
+XynDfWLB38dE1w3y+l1M1jA54oThxbY6jQ1xtsH//uaVs/N/KH56Tl9a7GbPkqOu
+BIAoHEP3VaBC4B2DHmv9NTi8Rig3yWn6fI455tJeOE1k9gJoipjnuIIfqnTyjS7S
+jiq6Ou5FTOEqQgLPeRmGW7g6EvnhUSXTSawYV46aXc8=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/student.grayzone.ladok.se-student-sp.xml b/swamid-2.0/student.grayzone.ladok.se-student-sp.xml
new file mode 100644
index 00000000..b9b364c7
--- /dev/null
+++ b/swamid-2.0/student.grayzone.ladok.se-student-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://student.grayzone.ladok.se/student-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla: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://student.grayzone.ladok.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://student.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok student.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://student.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://student.grayzone.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.grayzone.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.grayzone.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAIGkX/wOfnFpMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGXN0dWRlbnQuZ3JheXpvbmUubGFkb2suc2UwHhcNMTYwMzE0MTE0NjUyWhcN
+MjYwMzEyMTE0NjUyWjAkMSIwIAYDVQQDExlzdHVkZW50LmdyYXl6b25lLmxhZG9r
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7EZ6ip4ed9S31sHM
+kn3u3Jt7CzPEhlhY6pIG3N/hIkeUeZns49ga3WCxr7mSsYmMLOkK/WmOmgRr6X7I
+r4zwwGaFxHuyBifOEn8pbBF9+NZU2odYAqjXCwTTgI7Dv7oOEnI83Qvpwsfvu/B/
+Z9cvgpWWmK9IWDlgdrJstC9m3y4LkeTpbWfRnJfvl8nSl9woDoUE0sc9BqKGXJIF
+EUepi55j51lHA66q1HU5G2rcDWXtC1zZ0b7qmsIRD16TMqODgwsOAdZF33LHxp2b
+lLONXk001RzjUi3b4CNVm+PNXzCwibQSwmxJNQdtBPk0acFnSgRZX2c0hBSwvAg+
+qJooXwIDAQABo3EwbzBOBgNVHREERzBFghlzdHVkZW50LmdyYXl6b25lLmxhZG9r
+LnNlhihodHRwczovL3N0dWRlbnQuZ3JheXpvbmUubGFkb2suc2UvZ3VpLXNwMB0G
+A1UdDgQWBBSI2f1Krb20gR6VnpnH61B1vycoBTANBgkqhkiG9w0BAQsFAAOCAQEA
+K/pOvQFHi38hPYPWCZwOxfTGVye9orF5FSajYCyucrQLZhoDdj4e4gll/p33dHd8
+MevGPBcHvab4OetEonqLyTnauaGcummYfbu71SN+3cuyKuMuLuS6r6zjg4urKLTB
++T/ludsssL8Kh9JcZ9KNrCh6slW64WrvCs2/oZRBq6AK8S+1JxJWq25ooboaVxu+
+iL8W9vWi42ftSllQFlfaco3PwqFLyaLhI1Yf4BDQEPwVmliCRiLAOVMsF9Edfxr4
+3f0CFDF8FL3zPA2piWosG7hrENU5gNTWU4NW5J9PL9ElZNvcovBC2CMuz9W5Cciu
+SDtqcg4gkoVpkscIiQGWrw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/student.test.grayzone.ladok.se-student-sp.xml b/swamid-2.0/student.test.grayzone.ladok.se-student-sp.xml
new file mode 100644
index 00000000..ede0d914
--- /dev/null
+++ b/swamid-2.0/student.test.grayzone.ladok.se-student-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://student.test.grayzone.ladok.se/student-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla: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://student.test.grayzone.ladok.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://student.test.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok student.test.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student.test.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://student.test.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://student.test.grayzone.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.test.grayzone.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.test.grayzone.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAOowkJXVqISdMA0GCSqGSIb3DQEBCwUAMCkxJzAlBgNV
+BAMTHnN0dWRlbnQudGVzdC5ncmF5em9uZS5sYWRvay5zZTAeFw0xNjAzMjMwODM2
+MTVaFw0yNjAzMjEwODM2MTVaMCkxJzAlBgNVBAMTHnN0dWRlbnQudGVzdC5ncmF5
+em9uZS5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOGU
+NKa5sTalFItChmOxO4Z0yv6bxxgjLl2ocYUdQ1jA9Kh6YU9REbKwsQEmFXzp4J2f
+dG2oWf2Jdf0mjBohQY/GAr6Lgy+2gtyc46G0Rz9mDgH4WuGN+wGeSJ6PQmbVO6pZ
+lpSlFdes3lmxS50aMEcO8HefZjb59UEJXzlzVNHKpX3pi684WvpsLa8h42lLLorZ
+QlknnFZP6H+ANBJ1K70T1/mknGqET791EU5KcK+EAW7eLJxuiJtEFbT04Ax7heSY
+Ps3eg7i3QrL/Sah2aWp1JcBRJ0fzAZqAPgmD9wW9jI4PrBAaLm6Aginb4jy8IvaO
+CFZC+5HIGuViHHX7iz8CAwEAAaN7MHkwWAYDVR0RBFEwT4Iec3R1ZGVudC50ZXN0
+LmdyYXl6b25lLmxhZG9rLnNlhi1odHRwczovL3N0dWRlbnQudGVzdC5ncmF5em9u
+ZS5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFCnD8SZEql3o+hm3K4Q7AKxag9yy
+MA0GCSqGSIb3DQEBCwUAA4IBAQADTKXCoXrQxJz7ZWVOqLhTLAroHZBNO2iB9gqO
+BpyHScmT424Y91yaGgNN9hIY27v2NvkYrsgkB4IkwH96xpKwthQlSIQHqjk3xnOU
+HWcj4hLCvA2TLWNARRRcUuVJWaX9bqUZVdkySe3z/bh6t+pWTGVCcM+7STDGx5ai
+kC++gEkI/T09nbYiBFV6+WNM41z+DyhO9yGbKj6nhJqFo4A0jsw8Im8xoN+r969R
+Zq8CVQyNB59hRQFosEp1CYTocOE8N6apt6JeuZBIGEnpjxQIQ7D++/GHisdrqyVS
+3cs/hJKNAfqLA4JHw6hRIEVyLVvBbnbuEhWkPDhXcWl94OfN
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/student.test.ladok.se-student-sp.xml b/swamid-2.0/student.test.ladok.se-student-sp.xml
new file mode 100644
index 00000000..adeb6d85
--- /dev/null
+++ b/swamid-2.0/student.test.ladok.se-student-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://student.test.ladok.se/student-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla: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://student.test.ladok.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://student.test.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok student.test.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student.test.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://student.test.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://student.test.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.test.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.test.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAMfe9MUSIYwzMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
+BAMTFXN0dWRlbnQudGVzdC5sYWRvay5zZTAeFw0xNjAzMTcxMDQ0MTRaFw0yNjAz
+MTUxMDQ0MTRaMCAxHjAcBgNVBAMTFXN0dWRlbnQudGVzdC5sYWRvay5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoXQxzxa7rCjHFU3SiCf9W//E5x
+gZugxikwRTBus+1XiT9oNDSiztbFPTGsUv/PLaSeyPs6hqd2bpBh3yOOItb/PCQJ
+hGLVWFXZHSBifX4Aa+bh18ZbXtIPT8P+LhNMesdh6DVnDo5Ksd2cvbHxRO9WlNMb
+tzNM5iUJZiVfwmkwo3Y5xbWQ3NPCinmMQPWLVl0gKteoouu5SrCUm6s/TFNNIspQ
+IJRUlieSn0MUyYCidLpadbNEarcC5wX4Pn9viA4ZBimiUcOzbPyxUcdLdW3bHUEO
+E/F0b/+34N4oBUytLcFo4nTlUjWaKBSv7dwFAYt0UjATVp+LdMwZmBcgrvsCAwEA
+AaNpMGcwRgYDVR0RBD8wPYIVc3R1ZGVudC50ZXN0LmxhZG9rLnNlhiRodHRwczov
+L3N0dWRlbnQudGVzdC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFEdfw76scgUA
+y16cvwoO7eZP/DQbMA0GCSqGSIb3DQEBCwUAA4IBAQAdEWyyTL9P5TTNX0NuJmGA
+HNR/yi/RUIZ8vbFzuuSsFmMnKN+iVyQqnS0cWsHXs/KWNdziHSHcQusKp0l8Zmmb
+6Dj2adzigSVW22GNdFsDSRUkKuI70SP0gWCjlQ6pezYCNzNlG85VnMRHWkP461l2
+YUmMJSKSreltDQGom/gj9JDiFxaGr7puePNSyYqVX4AFY81u+JB5+tTTgyNhZRxc
+fUO4UUy2FV9/ugZdSEQmuL2TcPi/Qjr7iYf421GeoBUvEWeANRekKCb5IRhvWmw/
+KKCbhHGTmGZP2tQ6zng2z2GDI1/icN6GfRAuzgthsOqC74sM4tn8VoLT0IdDOPj5
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.test.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.test.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.test.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.test.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.test.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.test.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.test.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.test.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.test.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.test.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.test.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.test.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.test.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.test.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/student.utb.grayzone.ladok.se-student-sp.xml b/swamid-2.0/student.utb.grayzone.ladok.se-student-sp.xml
new file mode 100644
index 00000000..9e3bae39
--- /dev/null
+++ b/swamid-2.0/student.utb.grayzone.ladok.se-student-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://student.utb.grayzone.ladok.se/student-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla: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://student.utb.grayzone.ladok.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://student.utb.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok student.utb.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student.utb.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://student.utb.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://student.utb.grayzone.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.utb.grayzone.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.utb.grayzone.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAL6+vvBLbienMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
+BAMTHXN0dWRlbnQudXRiLmdyYXl6b25lLmxhZG9rLnNlMB4XDTE2MDMxNDExMzU1
+MVoXDTI2MDMxMjExMzU1MVowKDEmMCQGA1UEAxMdc3R1ZGVudC51dGIuZ3JheXpv
+bmUubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrwO5t
++t/WjW2ub3ds5fX0J1LKHHxX23zdhtgvZSvwhlJeJPzDaHVvDFs8A/hgCBcem+bJ
+XxtLsMG/uA2VMgDpG8dd1x/CtOBiLhehLLK44RwLG1A3Wf4BQgC9A9Yy+101ySDg
+QmTdPxPUoV/QdE2RNqIt7xtDU5xJsRR/TCcdPesYVNnvwJ/cTGpjJv4TwjFyds8C
+yt9tklRFO0QpcTTctN5jwHWOcS5F5XUz/yxymf0nIeVjcC+hBwYlRLSEVndTXH94
+Y3uEfD3Nr9Wh3fvVz3yFKvMvJ3+7rdAmazp8kr5ZFOz+mRp78WNWMEneeQ3E657w
+zeqNnnUn4WjDg1LbAgMBAAGjeTB3MFYGA1UdEQRPME2CHXN0dWRlbnQudXRiLmdy
+YXl6b25lLmxhZG9rLnNlhixodHRwczovL3N0dWRlbnQudXRiLmdyYXl6b25lLmxh
+ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUAoLT9XTxfcWhOBxQGxepp8ZhQR0wDQYJ
+KoZIhvcNAQELBQADggEBAFaVox+9QFZO6kud6xiIzTtdZA6UhfB7k7UdnpoTB5kp
+WgLtoBl10sEs4J4fdfNRqFmM0y6M6Ui2KMQ8CwVL3wPUiA4k6WmvX2wL7iNaULuh
+5NW6E6E1VV4AkF3aGXv+wP86oCR+7xUxGabJIP4A5wkE4EFnb5o8YfHHFlZ2kENF
+yZNMRxHA6hxBu4AUwVHn9w3NeLFvdz+VIoRdTCwJiKQIdOiIwh4uqdz+Nb27JawK
+FcB1uUnfHOFrWxR3hRPy/mxOtvCbBn1Ze80nVHwGUXnZU03EQD79EsrojE7X6Dy9
+APPgdPDSoTzmfWG0jod4DFTR1ldSdgpydyNVnmBMHaM=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/student.utb.uppfoljning.ladok.se-student-sp.xml b/swamid-2.0/student.utb.uppfoljning.ladok.se-student-sp.xml
new file mode 100644
index 00000000..100d218f
--- /dev/null
+++ b/swamid-2.0/student.utb.uppfoljning.ladok.se-student-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://student.utb.uppfoljning.ladok.se/student-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla: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://student.utb.uppfoljning.ladok.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://student.utb.uppfoljning.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok student.utb.uppfoljning.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student.utb.uppfoljning.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://student.utb.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://student.utb.uppfoljning.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.utb.uppfoljning.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.utb.uppfoljning.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDWDCCAkCgAwIBAgIJANRIJvqprHNXMA0GCSqGSIb3DQEBCwUAMCsxKTAnBgNV
+BAMTIHN0dWRlbnQudXRiLnVwcGZvbGpuaW5nLmxhZG9rLnNlMB4XDTE2MDMxODA4
+MzgzOVoXDTI2MDMxNjA4MzgzOVowKzEpMCcGA1UEAxMgc3R1ZGVudC51dGIudXBw
+Zm9sam5pbmcubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDHjfupZnJ8UUpOMpVTJcaliULDj1v+XeZ5zYmKe4Ufl9py/S7akmkq7PFoKUzn
+kBgi3XLBRfGfQPhupfCTnSID4j/BRRQTyfkuVOWbuvFLYUxaBkm5M4KLzr5GZEID
+j1EUiUoLBjksFJ5HC40H14psoAaRqwD53XoFJOjXd7ipCNeH3JgGz/C91ERzauCB
+9DYUZZfc8PB194uHm3EwwG6w8VGmxWaTNi0C0YWnQXs77nFlx86JK49G5j8Mib8h
+SrwyQ8nYoMkBgxhymh1IA5G1aKgyWabw7bqoKrelvus+ja4Y39yNdPiGmPSk27zo
+yoz05SaEnjTf2yCBvC7NELUVAgMBAAGjfzB9MFwGA1UdEQRVMFOCIHN0dWRlbnQu
+dXRiLnVwcGZvbGpuaW5nLmxhZG9rLnNlhi9odHRwczovL3N0dWRlbnQudXRiLnVw
+cGZvbGpuaW5nLmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUwD9J7Pnqr8ElOe0f
+xNrNd+M8HckwDQYJKoZIhvcNAQELBQADggEBAJBrD9xcMsYcgBJfiAZpezzwVHbv
+E/27kqZ22MxR+r3JljGfejLsjC3G8Tjn8RQgpUYpPV/OyX4WkYMHL+4eWM4Z0gpD
+VYmcaCdX0LbxYikDlaSWLhH8sDBKdleFg+NFd0pP1WX/iOTJX40IP8yyliwhGBfy
+OvsSj/YrtegFw8ldfmiM+GTsFBrVYvOMgrnN1wxQA3U0kjAnc+Ca8LIAYRnRuqHY
+hHgTDaGq27tcqC99MT5eOQBGn+C/rX8NYo7aoaYRA3bQiBpvTiwVwMxitp9L4gtG
+ERSUoBLzl0s9hzeUVctbKwHWqVcKqz7KWX+X7Zu/1Sh7pmJTUUwgoChDnXc=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/t0253.srv.lu.se-shibboleth.xml b/swamid-2.0/t0253.srv.lu.se-shibboleth.xml
index 09a6a5d4..b6f329cc 100644
--- a/swamid-2.0/t0253.srv.lu.se-shibboleth.xml
+++ b/swamid-2.0/t0253.srv.lu.se-shibboleth.xml
@@ -16,7 +16,7 @@
         <mdui:DisplayName xml:lang="sv">lu.se dev-server</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">lu.se dev-server</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Server för leveransområdet lu.se, där det sker utvecklingstester.</mdui:Description>
-        <mdui:Description xml:lang="en">Server for development tests for lu.se </mdui:Description>
+        <mdui:Description xml:lang="en">Server for development tests for lu.se</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/test-shh.pingpong.net-Shibboleth.sso-Metadata.xml b/swamid-2.0/test-shh.pingpong.net-Shibboleth.sso-Metadata.xml
index cd95a6cd..5f425720 100644
--- a/swamid-2.0/test-shh.pingpong.net-Shibboleth.sso-Metadata.xml
+++ b/swamid-2.0/test-shh.pingpong.net-Shibboleth.sso-Metadata.xml
@@ -27,11 +27,11 @@
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv"> PING PONG vid Sophiahemmets högskola </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en"> PING PONG at Sophiahemmet University </mdui:DisplayName>
-        <mdui:Description xml:lang="sv"> Lärplattformen PING PONG vid Sophiahemmets högskola. </mdui:Description>
-        <mdui:Description xml:lang="en"> The learning platform PING PONG at Sophiahemmet University. </mdui:Description>
-        <mdui:Logo height="168" width="50">https://test-shh.pingpong.net/login/pingpong-logo-168x50.png </mdui:Logo>
+        <mdui:DisplayName xml:lang="sv">PING PONG vid Sophiahemmets högskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">PING PONG at Sophiahemmet University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Lärplattformen PING PONG vid Sophiahemmets högskola.</mdui:Description>
+        <mdui:Description xml:lang="en">The learning platform PING PONG at Sophiahemmet University.</mdui:Description>
+        <mdui:Logo height="168" width="50">https://test-shh.pingpong.net/login/pingpong-logo-168x50.png</mdui:Logo>
         <mdui:Logo height="16" width="16">https://test-shh.pingpong.net/login/pingpong-logo-16x16.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://test-shh.pingpong.net/Shibboleth.sso/Login"/>
diff --git a/swamid-2.0/verify.studentbeans.com-shibboleth.xml b/swamid-2.0/verify.studentbeans.com-shibboleth.xml
index 3837a02c..0b3db007 100644
--- a/swamid-2.0/verify.studentbeans.com-shibboleth.xml
+++ b/swamid-2.0/verify.studentbeans.com-shibboleth.xml
@@ -96,8 +96,8 @@ UKG+a99pFdmiJhaVmr6ppycpR94IcDJb+8Px5A==
     <md:OrganizationURL xml:lang="cs">http://www.thebeansgroup.com</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName> William</md:GivenName>
-    <md:SurName> Harris</md:SurName>
+    <md:GivenName>William</md:GivenName>
+    <md:SurName>Harris</md:SurName>
     <md:EmailAddress>william@thebeansgroup.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml
deleted file mode 100644
index b1e1aa11..00000000
--- a/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://weblogin-test.kau.se/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Karlstads universitet Shib 3.2 Test Extra Config</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karlstad University Shib 3.2 Test Extra Config</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Shib 3 Test Identity Provider för Karlstads universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Shib 3 Test Identity Provider for Karlstad University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
-        <mdui:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <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>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUaN+mKKpQaU7v+8GzaBWQzDo7DBowDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYwMzEyMTIx
-MjQ5WhcNMzYwMzEyMTIxMjQ5WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKT6XhoTzvsMqo0A
-FRrC6YpUYOGW5iU9WHI5E7k6LwsGYxq7GITtomr6W9UcQOhQL0nGON3scGpcfh6J
-Ztdo1k9eVtTnzlNsrbbBYtV1rzlz7i66A6NMU9GP2ENOF5nGBxNcxivWohNZbrQa
-OKzEnZ70ST0Htmqi83Fc1jfHpAppj45N2vOaLbpkolb2Cj34N3kfyMQqEhcAaUDm
-NpcfxownvX5ixso6WVaIqt2hJeuw4YdQBKcEuuwRT4xQ8ufvmx3LoK0NE36B6PVb
-bsF9QZEbyegrM9JBzvK2gHUZoJoO0RBErcB7zNGX3JaHlNifBxcawzYN+blAXk/+
-ZZQJpQ0CAwEAAaNvMG0wHQYDVR0OBBYEFJuiJDrd3ObSxhevH12JPn43YVhiMEwG
-A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
-LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBf
-G3PVIs+ZwDNJ7pPxEWNFSZ2WZLzqMNI8KGt8Yf5qShx0lwCVzQze08UT/1AW4Qc5
-QWY+xLxABIrt6YObV3MWiw4TTt8xA9NduBvcl4bjmJ3dOnbi49fAxHc4aIszrjIj
-/PPizFmx8xMJrIt1UpjXqAEbu6gp7aieJL0uEmclp/qZOuqXs73rrOpuhrdp8EZX
-6iXLsGGGFGWNlN3n2MWi7NUa7hMrPSNPnKmjkUDorKr5ZwcG+KUI8claNUKvBdWi
-D5lvLIy+27xm3DjQehzUTKwva/nDhEyWL7+etkn2XvdmYzifwGlFDMKGomNbOeLO
-k/PMUydRWY4NsAGRdlW+
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUbQ2ZsdUwqDQ83lqCKSpybQD4L9IwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYwMzEyMTIx
-MjQ4WhcNMzYwMzEyMTIxMjQ4WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALI9ied2RHMbRA8U
-zbxIjsbfemKxZZivBFuWw5GlP8dA8fJnWjCLiZ/B/YWy7QCI3sI8ZlFPK5KOl5jF
-khTca4EI6tfceohEhmJhZBuFCnBl70cVo5U2z03qFtKevjcSto2k063MtQ3msDNf
-jE8OXJeklNYX87ne4PPmI3G9PlZrMjVI97xbTkgwYgRj7uCB7zU9b0LxRackdV9y
-iTkHFRuPOak8OQPop9FHU+YjUUggZwiVn8S0yZpre2uREf0BfGkXwBdSQf2UllX6
-OY/U9aJuXNRwnEpVd5ALvcISECKtFZCmlKzerh6dEKON61q22PNLYnRARe6iTqZ/
-HKct+MUCAwEAAaNvMG0wHQYDVR0OBBYEFAnfCJ3mh+/1vIKJw9mRq6aPfVkFMEwG
-A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
-LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCG
-IDFdq7Gfja8LRuSDGAt4D8pwYvDGluEqxPdPfPvzLLzcQ87Ke072/Jlk6yk563v5
-fxFvOfeuelxHTUbUbeu7ig9maVzE4iyEzBwO+ideyIfagvKPAturkBxlXu9rmMCK
-OMLHz+IS4tfZ0hSEuVOf/n5vBdcsmEFvRBKl2SVaAhJIj2CqNc5S1xCTyj/2Xmox
-GU47J7GZkCdMrcaQEwgLW+ATKCBXRYhwfKIVRpoB+LpYrXGMmi9j4bfGHbHF0zxm
-k9MHz9eszrmTNiBWSbRfIH6N+XoooIZmgR/TSy9poJXNLYMWPy/BMKLi1eDY2Buz
-p7akttAl2GLD4OSXvCYA
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAKER/mP4HA9XsC+pd3aejETEODsHMA0GCSqGSIb3DQEB
-CwUAMB8xHTAbBgNVBAMMFHdlYmxvZ2luLXRlc3Qua2F1LnNlMB4XDTE2MDMxMjEy
-MTI0OVoXDTM2MDMxMjEyMTI0OVowHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5r
-YXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCKv3unN9QyCPAa
-3uV7J+OMuyreCQn/xEtijZOLuikw6lZj2Yh2zmc4t11i5MTM9bMwLPfHZN8HRTeo
-ywwqYZMe8xNn45Jb8iDE4hMDKbHelqjvnQYZBOZsOK/nKMqfnvupuBq53qu8BfNM
-1EZplnx4znDE71LKW0PBWN8AVCjGF9SJnhwdeIs4/pm6Exz1tDLnUhTwmT1Pu0q3
-Eujl1OO9qhHc7QpNIbaVgwF/2c/4kd1R6rlJzXqh4yRZaYLtl4bfTVXPn+NGG3YU
-fH4Kk/qabHzwYW2OZ0nyiktUxUcsWtLsmF6D3eagpzS0GAiAHWS+ooxD7WctUuB+
-5zhex7YrAgMBAAGjbzBtMB0GA1UdDgQWBBSSJxYExMnKgHbNtx6m9Ds4tDln+jBM
-BgNVHREERTBDghR3ZWJsb2dpbi10ZXN0LmthdS5zZYYraHR0cHM6Ly93ZWJsb2dp
-bi10ZXN0LmthdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-cbhq9Slo24nOMUG5WImD3Q/nVWQk4JUrKaJVFEFDfVmvZnaRzoz7tnaSEoSXfShr
-K9fL64y98FLWMmL/Ps7noTls1H1T/B9FCgWRd1Ck40rnrPr3TkOZQE0OrZFXJUW2
-igZjna9pxb9LuJpo5uSuz1m3lKaiV8QFrolvpy705jETE5+qCNPfaU1fWCYhCDUw
-vnk2FNf07yLBGIiibleYd60rdP0uiyvtWYb4cNn5dMzrMSUILNwXjR7tHdXUZjqW
-dWxDXEgV+GOZVrYg8nnNmeQZ/16GO3EAuqMMN9n1qYlMQKkwEPIaX/WGeu0gIhlt
-OFd2AiNzPV7MdiKPOCUPXg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin-test.kau.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin-test.kau.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin-test.kau.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUaN+mKKpQaU7v+8GzaBWQzDo7DBowDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYwMzEyMTIx
-MjQ5WhcNMzYwMzEyMTIxMjQ5WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKT6XhoTzvsMqo0A
-FRrC6YpUYOGW5iU9WHI5E7k6LwsGYxq7GITtomr6W9UcQOhQL0nGON3scGpcfh6J
-Ztdo1k9eVtTnzlNsrbbBYtV1rzlz7i66A6NMU9GP2ENOF5nGBxNcxivWohNZbrQa
-OKzEnZ70ST0Htmqi83Fc1jfHpAppj45N2vOaLbpkolb2Cj34N3kfyMQqEhcAaUDm
-NpcfxownvX5ixso6WVaIqt2hJeuw4YdQBKcEuuwRT4xQ8ufvmx3LoK0NE36B6PVb
-bsF9QZEbyegrM9JBzvK2gHUZoJoO0RBErcB7zNGX3JaHlNifBxcawzYN+blAXk/+
-ZZQJpQ0CAwEAAaNvMG0wHQYDVR0OBBYEFJuiJDrd3ObSxhevH12JPn43YVhiMEwG
-A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
-LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBf
-G3PVIs+ZwDNJ7pPxEWNFSZ2WZLzqMNI8KGt8Yf5qShx0lwCVzQze08UT/1AW4Qc5
-QWY+xLxABIrt6YObV3MWiw4TTt8xA9NduBvcl4bjmJ3dOnbi49fAxHc4aIszrjIj
-/PPizFmx8xMJrIt1UpjXqAEbu6gp7aieJL0uEmclp/qZOuqXs73rrOpuhrdp8EZX
-6iXLsGGGFGWNlN3n2MWi7NUa7hMrPSNPnKmjkUDorKr5ZwcG+KUI8claNUKvBdWi
-D5lvLIy+27xm3DjQehzUTKwva/nDhEyWL7+etkn2XvdmYzifwGlFDMKGomNbOeLO
-k/PMUydRWY4NsAGRdlW+
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUbQ2ZsdUwqDQ83lqCKSpybQD4L9IwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYwMzEyMTIx
-MjQ4WhcNMzYwMzEyMTIxMjQ4WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALI9ied2RHMbRA8U
-zbxIjsbfemKxZZivBFuWw5GlP8dA8fJnWjCLiZ/B/YWy7QCI3sI8ZlFPK5KOl5jF
-khTca4EI6tfceohEhmJhZBuFCnBl70cVo5U2z03qFtKevjcSto2k063MtQ3msDNf
-jE8OXJeklNYX87ne4PPmI3G9PlZrMjVI97xbTkgwYgRj7uCB7zU9b0LxRackdV9y
-iTkHFRuPOak8OQPop9FHU+YjUUggZwiVn8S0yZpre2uREf0BfGkXwBdSQf2UllX6
-OY/U9aJuXNRwnEpVd5ALvcISECKtFZCmlKzerh6dEKON61q22PNLYnRARe6iTqZ/
-HKct+MUCAwEAAaNvMG0wHQYDVR0OBBYEFAnfCJ3mh+/1vIKJw9mRq6aPfVkFMEwG
-A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
-LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCG
-IDFdq7Gfja8LRuSDGAt4D8pwYvDGluEqxPdPfPvzLLzcQ87Ke072/Jlk6yk563v5
-fxFvOfeuelxHTUbUbeu7ig9maVzE4iyEzBwO+ideyIfagvKPAturkBxlXu9rmMCK
-OMLHz+IS4tfZ0hSEuVOf/n5vBdcsmEFvRBKl2SVaAhJIj2CqNc5S1xCTyj/2Xmox
-GU47J7GZkCdMrcaQEwgLW+ATKCBXRYhwfKIVRpoB+LpYrXGMmi9j4bfGHbHF0zxm
-k9MHz9eszrmTNiBWSbRfIH6N+XoooIZmgR/TSy9poJXNLYMWPy/BMKLi1eDY2Buz
-p7akttAl2GLD4OSXvCYA
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAKER/mP4HA9XsC+pd3aejETEODsHMA0GCSqGSIb3DQEB
-CwUAMB8xHTAbBgNVBAMMFHdlYmxvZ2luLXRlc3Qua2F1LnNlMB4XDTE2MDMxMjEy
-MTI0OVoXDTM2MDMxMjEyMTI0OVowHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5r
-YXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCKv3unN9QyCPAa
-3uV7J+OMuyreCQn/xEtijZOLuikw6lZj2Yh2zmc4t11i5MTM9bMwLPfHZN8HRTeo
-ywwqYZMe8xNn45Jb8iDE4hMDKbHelqjvnQYZBOZsOK/nKMqfnvupuBq53qu8BfNM
-1EZplnx4znDE71LKW0PBWN8AVCjGF9SJnhwdeIs4/pm6Exz1tDLnUhTwmT1Pu0q3
-Eujl1OO9qhHc7QpNIbaVgwF/2c/4kd1R6rlJzXqh4yRZaYLtl4bfTVXPn+NGG3YU
-fH4Kk/qabHzwYW2OZ0nyiktUxUcsWtLsmF6D3eagpzS0GAiAHWS+ooxD7WctUuB+
-5zhex7YrAgMBAAGjbzBtMB0GA1UdDgQWBBSSJxYExMnKgHbNtx6m9Ds4tDln+jBM
-BgNVHREERTBDghR3ZWJsb2dpbi10ZXN0LmthdS5zZYYraHR0cHM6Ly93ZWJsb2dp
-bi10ZXN0LmthdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-cbhq9Slo24nOMUG5WImD3Q/nVWQk4JUrKaJVFEFDfVmvZnaRzoz7tnaSEoSXfShr
-K9fL64y98FLWMmL/Ps7noTls1H1T/B9FCgWRd1Ck40rnrPr3TkOZQE0OrZFXJUW2
-igZjna9pxb9LuJpo5uSuz1m3lKaiV8QFrolvpy705jETE5+qCNPfaU1fWCYhCDUw
-vnk2FNf07yLBGIiibleYd60rdP0uiyvtWYb4cNn5dMzrMSUILNwXjR7tHdXUZjqW
-dWxDXEgV+GOZVrYg8nnNmeQZ/16GO3EAuqMMN9n1qYlMQKkwEPIaX/WGeu0gIhlt
-OFd2AiNzPV7MdiKPOCUPXg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">KAU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Karlstads universitet Shib 3.2 Test Extra Config</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Karlstad University Shib 3.2 Test Extra Config</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <Company>Karlstad University</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>mailto:webbteknik@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>Karlstad University</Company>
-    <SurName>Paul Scott</SurName>
-    <EmailAddress>mailto:paul.scott@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2307</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>Karlstad University</Company>
-    <SurName>IT-avdelningen Karlstads universitet</SurName>
-    <EmailAddress>mailto:datasupport@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0/weblogin-test2.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin-test2.kau.se-idp-shibboleth.xml
deleted file mode 100644
index aa88c050..00000000
--- a/swamid-2.0/weblogin-test2.kau.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://weblogin-test2.kau.se/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Karlstads universitet Shib 3.2 Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karlstad University Shib 3.2 Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Shib 3 Test Identity Provider för Karlstads universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Shib 3 Test Identity Provider for Karlstad University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
-        <mdui:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <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>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIULKFv582yW+7nwnlV6miCwNM5+gswDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAwwVd2VibG9naW4tdGVzdDIua2F1LnNlMB4XDTE2MDMwOTE2
-NTA1MloXDTM2MDMwOTE2NTA1MlowIDEeMBwGA1UEAwwVd2VibG9naW4tdGVzdDIu
-a2F1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhLq868nxQrZX
-eAkx/O6xyHnCeSXDUXgAVvlXc1xS/x44+hvZ4zZLtS62l5bLPLwlrzmAi0AzFxjF
-ESyV813sJEcftWiCR269kUSTaR5xs9AxaAXyMGMGIjVb/5eWb83uTmMy1nhTWHsD
-6DVrwSut1wm4SBB8QqdXElktZV00kW+i7Iot6Pu3eu/uVLF7fsfTEGeugyTu0pRX
-Ea0f0IrDtNwzF7grZWOMGvGGEyTodyoMcBkK+imswG0AGZrQ3kdww1Lcf08xdKFG
-g/rkYiIz6j5hP4zjJOw3zuPeYug19ze9nxukBALcoRAwn1sSqFYIGr9VWWhSHCJB
-3OAx64yaPQIDAQABo3EwbzAdBgNVHQ4EFgQUShZDYIT4n42L3ShcE54Y7XkvTx0w
-TgYDVR0RBEcwRYIVd2VibG9naW4tdGVzdDIua2F1LnNlhixodHRwczovL3dlYmxv
-Z2luLXRlc3QyLmthdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAAXgCjiDeTmwQa5l4SWldhSR7AM0JxDr4iSrGz48x60M+V2H4tVwlcTFQvRLa
-IYxXybvTvyb38nTCLPOQjQJJdFLL+A6YiYQwK9ZDZhz1ajCY85nSntG6xsBbvzN2
-F2o0WH4QMHkWZqBKACPBRfRaotSVaq4qcMp0SYBoUKkS+2zb4svbsTadek1o5osz
-3rjQsz2tvUOLsMihdcQJK8vxW29TrLispGeVCZngGROUKQDcVRnS7W5hcRj3sFAi
-q0+WEK9XrBuj+vLlOi/+MX+EwEx2rmtp9gEUj2dM6uuQJ2+V80LVHtZlOlqzZCch
-nV9Kpy0ZNxep1b7AIb2+zGuTAw==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVAMjUY6EPTpmvL13VIEEfp3oy1vxYMA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFXdlYmxvZ2luLXRlc3QyLmthdS5zZTAeFw0xNjAzMDkx
-NjUwNTFaFw0zNjAzMDkxNjUwNTFaMCAxHjAcBgNVBAMMFXdlYmxvZ2luLXRlc3Qy
-LmthdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKT0+TVuk2yS
-QugObH9b8hZ9t7K7jhFK96Da851sQ5JgPj7KdO4U8WVlCVrAmlxOHFJJfg0jDLwe
-ocowhuT7eRxU6I6XZo8Lw9zoVHetMQPyxubcZMKSw7p6u5dGvORVNDmN35azSF+e
-KiQHaC3BaxQiKEXdYkygj9xq0jDJhX9W17bbHXnea93tqPGoYarFIexK8HE56rCj
-W+5d9atXEiy/Knsx1DobvQKYQAgvdSmiy9kQ42DF6c/QykVtzVnWq/CgStn/vBDI
-VjG5z3wi3zl3BgXNEpLezbNS+CEfF6NHyrjBWuxYB64dzUWz1Vm6tIxiXxJoS1oD
-W3gvW2Nk+N0CAwEAAaNxMG8wHQYDVR0OBBYEFGfystdfl5ePiZyJtcdJK7eeH1XT
-ME4GA1UdEQRHMEWCFXdlYmxvZ2luLXRlc3QyLmthdS5zZYYsaHR0cHM6Ly93ZWJs
-b2dpbi10ZXN0Mi5rYXUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAEzvMHkk74OUd0YlmStjD7jD68R2g3zerzKQX2HYAVL/CW6nG8Vc2+GN7q9v
-qYJhzreM+wj/QveeB33bysu2N7uel781e2NV/GwvgtczOfWov1hue5tRpDe0Raio
-8XtQltWFmiT6/A/3QZ10KyLf5ffOwolSrfGiJcHSheEvcyIZ5HtHpLaq70AWcmhj
-bXt4mWapugsFlE8Z4tUmCk9qLjxK9OHl05zQQAwL7bGhVa9WaccfTw4zCzb4c8ud
-1mLrxa3HlV7lU34v13q+cGaLJy1AfZT/Q0eHubc4LR9hR5BXIEig7qPuLmqtMZ29
-vwis6DM4uwOtx2YJmQyRSiDBlws=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVALmfWHfhMu3Y3sCzR49H/oo5Tuq3MA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFXdlYmxvZ2luLXRlc3QyLmthdS5zZTAeFw0xNjAzMDkx
-NjUwNTFaFw0zNjAzMDkxNjUwNTFaMCAxHjAcBgNVBAMMFXdlYmxvZ2luLXRlc3Qy
-LmthdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALcL48pPQicI
-B+0Hl9TTdZrDU4lBNyvC3yO31wupHtJFiQhonvouCyexGim6VuKtOhdd/G3FLTcp
-o8IKbFWZ5jtH8Po6P9djSlFYlI30WlMeC4SLvPD3eXGEW4KzXmoWIEmlYlsZW3+q
-iHDwqoBLt6aBjyyr/FMGhbP2N88JjoOje1vmiZlp7WAPx8p05LlJ1aaW7Y2h0u9T
-466o72UJl2bHPxMn+zr9wAr2yf95etBNuGFw4I9VEP0ruV6smjd3SZgTQJXiHtCU
-Hp0M3rY0C1e5zWw/quz1rkfKU2U1E3VlRkow+yvfpD7d7AtAqqoukR0EfWOHM8Ko
-Z7HHRbC3SuECAwEAAaNxMG8wHQYDVR0OBBYEFBtf1Muz/KnsSB7uwo//e9sv4fMw
-ME4GA1UdEQRHMEWCFXdlYmxvZ2luLXRlc3QyLmthdS5zZYYsaHR0cHM6Ly93ZWJs
-b2dpbi10ZXN0Mi5rYXUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAFz074dEuL/dHvJbEJf5/T49ixnQMg3vD0WcT5ov2PDCh9QnUO06bg67etkC
-c+irCY0LMoauxfwD1ImEYUmTUw/JjOqxvhOqm6ThA/ovSMufunMK07h8Txrd3AX2
-RD0WSu8Cd02o51ltItNmoxuKLnJbBRk64jrOs15kKn6yqWYflo98jjFy6nnivlr8
-UC/aVcmaaZYkkAHklosfK/8Tom70Ytga9ftSK8VcD5R/JBWRW1955Fl6A751rbww
-GIpQ2zwTVgAm8HJCF9uQVP5xnYD31Kal0u/QH4XjAbioEt1ci86acVanLoErvpwc
-d3vJ61Fswk4paWfQlUhCh/M5sDY=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test2.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin-test2.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin-test2.kau.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin-test2.kau.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin-test2.kau.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIULKFv582yW+7nwnlV6miCwNM5+gswDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAwwVd2VibG9naW4tdGVzdDIua2F1LnNlMB4XDTE2MDMwOTE2
-NTA1MloXDTM2MDMwOTE2NTA1MlowIDEeMBwGA1UEAwwVd2VibG9naW4tdGVzdDIu
-a2F1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhLq868nxQrZX
-eAkx/O6xyHnCeSXDUXgAVvlXc1xS/x44+hvZ4zZLtS62l5bLPLwlrzmAi0AzFxjF
-ESyV813sJEcftWiCR269kUSTaR5xs9AxaAXyMGMGIjVb/5eWb83uTmMy1nhTWHsD
-6DVrwSut1wm4SBB8QqdXElktZV00kW+i7Iot6Pu3eu/uVLF7fsfTEGeugyTu0pRX
-Ea0f0IrDtNwzF7grZWOMGvGGEyTodyoMcBkK+imswG0AGZrQ3kdww1Lcf08xdKFG
-g/rkYiIz6j5hP4zjJOw3zuPeYug19ze9nxukBALcoRAwn1sSqFYIGr9VWWhSHCJB
-3OAx64yaPQIDAQABo3EwbzAdBgNVHQ4EFgQUShZDYIT4n42L3ShcE54Y7XkvTx0w
-TgYDVR0RBEcwRYIVd2VibG9naW4tdGVzdDIua2F1LnNlhixodHRwczovL3dlYmxv
-Z2luLXRlc3QyLmthdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAAXgCjiDeTmwQa5l4SWldhSR7AM0JxDr4iSrGz48x60M+V2H4tVwlcTFQvRLa
-IYxXybvTvyb38nTCLPOQjQJJdFLL+A6YiYQwK9ZDZhz1ajCY85nSntG6xsBbvzN2
-F2o0WH4QMHkWZqBKACPBRfRaotSVaq4qcMp0SYBoUKkS+2zb4svbsTadek1o5osz
-3rjQsz2tvUOLsMihdcQJK8vxW29TrLispGeVCZngGROUKQDcVRnS7W5hcRj3sFAi
-q0+WEK9XrBuj+vLlOi/+MX+EwEx2rmtp9gEUj2dM6uuQJ2+V80LVHtZlOlqzZCch
-nV9Kpy0ZNxep1b7AIb2+zGuTAw==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVAMjUY6EPTpmvL13VIEEfp3oy1vxYMA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFXdlYmxvZ2luLXRlc3QyLmthdS5zZTAeFw0xNjAzMDkx
-NjUwNTFaFw0zNjAzMDkxNjUwNTFaMCAxHjAcBgNVBAMMFXdlYmxvZ2luLXRlc3Qy
-LmthdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKT0+TVuk2yS
-QugObH9b8hZ9t7K7jhFK96Da851sQ5JgPj7KdO4U8WVlCVrAmlxOHFJJfg0jDLwe
-ocowhuT7eRxU6I6XZo8Lw9zoVHetMQPyxubcZMKSw7p6u5dGvORVNDmN35azSF+e
-KiQHaC3BaxQiKEXdYkygj9xq0jDJhX9W17bbHXnea93tqPGoYarFIexK8HE56rCj
-W+5d9atXEiy/Knsx1DobvQKYQAgvdSmiy9kQ42DF6c/QykVtzVnWq/CgStn/vBDI
-VjG5z3wi3zl3BgXNEpLezbNS+CEfF6NHyrjBWuxYB64dzUWz1Vm6tIxiXxJoS1oD
-W3gvW2Nk+N0CAwEAAaNxMG8wHQYDVR0OBBYEFGfystdfl5ePiZyJtcdJK7eeH1XT
-ME4GA1UdEQRHMEWCFXdlYmxvZ2luLXRlc3QyLmthdS5zZYYsaHR0cHM6Ly93ZWJs
-b2dpbi10ZXN0Mi5rYXUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAEzvMHkk74OUd0YlmStjD7jD68R2g3zerzKQX2HYAVL/CW6nG8Vc2+GN7q9v
-qYJhzreM+wj/QveeB33bysu2N7uel781e2NV/GwvgtczOfWov1hue5tRpDe0Raio
-8XtQltWFmiT6/A/3QZ10KyLf5ffOwolSrfGiJcHSheEvcyIZ5HtHpLaq70AWcmhj
-bXt4mWapugsFlE8Z4tUmCk9qLjxK9OHl05zQQAwL7bGhVa9WaccfTw4zCzb4c8ud
-1mLrxa3HlV7lU34v13q+cGaLJy1AfZT/Q0eHubc4LR9hR5BXIEig7qPuLmqtMZ29
-vwis6DM4uwOtx2YJmQyRSiDBlws=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVALmfWHfhMu3Y3sCzR49H/oo5Tuq3MA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFXdlYmxvZ2luLXRlc3QyLmthdS5zZTAeFw0xNjAzMDkx
-NjUwNTFaFw0zNjAzMDkxNjUwNTFaMCAxHjAcBgNVBAMMFXdlYmxvZ2luLXRlc3Qy
-LmthdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALcL48pPQicI
-B+0Hl9TTdZrDU4lBNyvC3yO31wupHtJFiQhonvouCyexGim6VuKtOhdd/G3FLTcp
-o8IKbFWZ5jtH8Po6P9djSlFYlI30WlMeC4SLvPD3eXGEW4KzXmoWIEmlYlsZW3+q
-iHDwqoBLt6aBjyyr/FMGhbP2N88JjoOje1vmiZlp7WAPx8p05LlJ1aaW7Y2h0u9T
-466o72UJl2bHPxMn+zr9wAr2yf95etBNuGFw4I9VEP0ruV6smjd3SZgTQJXiHtCU
-Hp0M3rY0C1e5zWw/quz1rkfKU2U1E3VlRkow+yvfpD7d7AtAqqoukR0EfWOHM8Ko
-Z7HHRbC3SuECAwEAAaNxMG8wHQYDVR0OBBYEFBtf1Muz/KnsSB7uwo//e9sv4fMw
-ME4GA1UdEQRHMEWCFXdlYmxvZ2luLXRlc3QyLmthdS5zZYYsaHR0cHM6Ly93ZWJs
-b2dpbi10ZXN0Mi5rYXUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAFz074dEuL/dHvJbEJf5/T49ixnQMg3vD0WcT5ov2PDCh9QnUO06bg67etkC
-c+irCY0LMoauxfwD1ImEYUmTUw/JjOqxvhOqm6ThA/ovSMufunMK07h8Txrd3AX2
-RD0WSu8Cd02o51ltItNmoxuKLnJbBRk64jrOs15kKn6yqWYflo98jjFy6nnivlr8
-UC/aVcmaaZYkkAHklosfK/8Tom70Ytga9ftSK8VcD5R/JBWRW1955Fl6A751rbww
-GIpQ2zwTVgAm8HJCF9uQVP5xnYD31Kal0u/QH4XjAbioEt1ci86acVanLoErvpwc
-d3vJ61Fswk4paWfQlUhCh/M5sDY=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test2.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">KAU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Karlstads universitet Shib 3.2 Test</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Karlstad University Shib 3.2 Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <Company>Karlstad University</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>mailto:webbteknik@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>Karlstad University</Company>
-    <SurName>Paul Scott</SurName>
-    <EmailAddress>mailto:paul.scott@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2307</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>Karlstad University</Company>
-    <SurName>IT-avdelningen Karlstads universitet</SurName>
-    <EmailAddress>mailto:datasupport@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml
new file mode 100644
index 00000000..fa0955e2
--- /dev/null
+++ b/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://weblogin.kau.se/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Karlstads universitet (ny)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Karlstad University (new)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Karlstads universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Karlstad University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
+        <mdui:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <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>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAKqRgJlUZAb1CREA2cmklaWM4Hs/MA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTAeFw0xNjAzMjUxMTAyMjBa
+Fw0zNjAzMjUxMTAyMjBaMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIrfx2rTVhTB7Pm0oTIvfBpSwkLk
+D8U7RYZH8vx+tOKWZp2d6g6QBOxpaNAZRKpvJoj/vclG37HKjkNi8xQQSNAWqUqo
+Gg7HTbg7GP/Q4MR5SVKZNsxTg4y9xz18Z2+YmiU26XLZHg1S1Dpvz1QkP/bWK4Ci
+7hIcANs//xJnurUHkxOJELtsx3NgR/SGCS3THcZhzFd1kr8c6vnjO6FBywUkbcdP
+pnyRmJnP17PL6r51f29m8/PDXghA98m04mB6p4bCrHrEsXw5fkqsHxa5a2/T0ULu
+31Tsaqmri6s+pgCyZ4P2itaLw0JG0kOpF5wuGlH7abKFOt2/+julrk0osfsCAwEA
+AaNlMGMwHQYDVR0OBBYEFA0OLDhIJ0KBHqZuAWyDTXLllATDMEIGA1UdEQQ7MDmC
+D3dlYmxvZ2luLmthdS5zZYYmaHR0cHM6Ly93ZWJsb2dpbi5rYXUuc2UvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAHjo2rrBQJw4w2XerUZad9Bnnj/C
+E+gAidE2Xdz6UaQId+BJ8P4FexxjJbwOz+qEx8lYyWt3ooqIfAbvyebFCRKSjFny
+L1chS4B8WuTPP+8UfPOcSoiOyXHtNqsWWLAIOcFwUUx27hF3IL2DvYi9zebO0uFO
+PiCp6QE0qQ/0HeDbnDjNmS7F8HPgx2IsJyEiEgYdR70w8n1DQB5ccekzpUDCBBNq
+W3q6OazE9V8ZdHjEA8FAJZ7Fo3cjgvkiVtow0CTiB7Aidya8HJc1KTemqUAAwLsT
+J3tGPHwu/RoCjpTvgbZcfT7vb+rMHYjlAaGfAe+dwgLq0XGn+id/ZdMf510=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAKxgqy7GuYcvyA/bSKh2g6NFUiCOMA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTAeFw0xNjAzMjUxMTAyMTla
+Fw0zNjAzMjUxMTAyMTlaMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLpj1x2QOzpy5P769ZzMDBWd/SB
+IamtFwi3yWpGNPFPxgFcRdH9srirVG/jCf8CV63xbqIFw5t5avllFx1sdGDexV0j
+xaikv3IEzUFuAdu1G/Y3gA6WT0Eaz3Wo539B6OMOWm/+S7LhtO92wEmD9QGEnzqK
+hWHafhLNIyatF6nRd8nW6qR1LIeWCJIc6+l9EIN7fgGv91F7qoUmdWWYFEbMaGjg
+aCU+G63qksrn8lme+qYu/mg7PLTkoGpWN5PDF1+ZJ+PWUauWF0BaHkZ1J/2oVBI9
+gTPRAcyapxI/vkbY76ntt9Tpds+ZnjgLt0UvglEHg62QfvjOqkDRn9INMr0CAwEA
+AaNlMGMwHQYDVR0OBBYEFMALZKbkq9w3sXzoVj19Ybn4iHoMMEIGA1UdEQQ7MDmC
+D3dlYmxvZ2luLmthdS5zZYYmaHR0cHM6Ly93ZWJsb2dpbi5rYXUuc2UvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFcnLl3I15O+8P1nbTwrl3ON7lYd
+maRmTTShHl3lUH87aRHbiyyoufQ9IZUVx7/lYr9R0956SXUeiXgrBwxGA7GFBR2g
+cOR0d99zxb5O5fp98Q2AsrNsfYkdkufrM07ro5kPUlAvmQyJSjoJ6eN6jn2nOJaQ
+wc5T0ouk9m5goKUJRK7mw6tRTVOw+3sA7Q8R6KW5Hge4uCCJVCnYXLAy/LR117A/
+zAjX3Z+Ui+HQajRXgxc1HyYHWJRnAzE2lb5na1/T6II0rInH7PMeqoUpmFWOOD86
+ZPI4RtsDWZUL5YWyHEokiQxtD9wZmhXrTUiHoVwbFjK+zfFpH/K4vhnweyw=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUGpvwFdQDTd5OR/3tImBGs68ViIIwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPd2VibG9naW4ua2F1LnNlMB4XDTE2MDMyNTExMDIyMFoX
+DTM2MDMyNTExMDIyMFowGjEYMBYGA1UEAwwPd2VibG9naW4ua2F1LnNlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlWvlRN7Q3Mh8KriChoB80l1JXzQw
+MthELvY6wwzf3fJ4VVIKFn0Kqql0JgwD/VOuA+MPbaqZDNWVcD5EmYhAs4k5cxSq
+jtb7RHdmAfTrnqB8XqM6wGP23sqa7brz7FDpT2kdCHkVn5Reazvltc4aUWepiXu4
+zDOd4fvyTwKcG4R2al6vPPg1ocvYOpOaaskNhjKk7KKF1fm233yLSiZZt/6yGipw
+EB/Vaj6+0ZOzmVCv8RFS5GiHroDzDRFquyrMKNXoqIVgcdsdq1ajeVazOvz+5p7k
+DonBQ31iphDxI3177QPWNIFy5VjvZoHzpiSIOHB7PEpJUkdfxlTS5Q6R6wIDAQAB
+o2UwYzAdBgNVHQ4EFgQUJNaYAquqKRGvgUZVPiWrZ0OSJI8wQgYDVR0RBDswOYIP
+d2VibG9naW4ua2F1LnNlhiZodHRwczovL3dlYmxvZ2luLmthdS5zZS9pZHAvc2hp
+YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAbsPfGxOUvMCzNS+ZIa+1woB7wRJH
+UdvS+jdnC86qB7pcfeUgqC+hWGzEQjeBpL31lrplfJq5j+c5E4AC97J11cCG7XP7
+6vZniOszZEvPnjI34OL4NrAs4VGSLeF7F9ZC8jyPdWEK2nan3ivWb5tIcfJzd1zp
+1amHFcKAlLVl8kMkLY1GB4kA+/Tz8epC0QDrgRHCdtgKmwfr1vbmAa6KmdldaBAa
+Cn3WZ3K74iMQSSbaR9g9oX/Ag+jeXkBCdEKknolZ+6FWVinu3oeuRiqvWYkLCF0Q
+cHgs7D1QiqGixbmFlSZyPcCPcIzPDzRaoXyb+yKQy31QP/VEt8VGXH5H2A==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.kau.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.kau.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.kau.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAKqRgJlUZAb1CREA2cmklaWM4Hs/MA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTAeFw0xNjAzMjUxMTAyMjBa
+Fw0zNjAzMjUxMTAyMjBaMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIrfx2rTVhTB7Pm0oTIvfBpSwkLk
+D8U7RYZH8vx+tOKWZp2d6g6QBOxpaNAZRKpvJoj/vclG37HKjkNi8xQQSNAWqUqo
+Gg7HTbg7GP/Q4MR5SVKZNsxTg4y9xz18Z2+YmiU26XLZHg1S1Dpvz1QkP/bWK4Ci
+7hIcANs//xJnurUHkxOJELtsx3NgR/SGCS3THcZhzFd1kr8c6vnjO6FBywUkbcdP
+pnyRmJnP17PL6r51f29m8/PDXghA98m04mB6p4bCrHrEsXw5fkqsHxa5a2/T0ULu
+31Tsaqmri6s+pgCyZ4P2itaLw0JG0kOpF5wuGlH7abKFOt2/+julrk0osfsCAwEA
+AaNlMGMwHQYDVR0OBBYEFA0OLDhIJ0KBHqZuAWyDTXLllATDMEIGA1UdEQQ7MDmC
+D3dlYmxvZ2luLmthdS5zZYYmaHR0cHM6Ly93ZWJsb2dpbi5rYXUuc2UvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAHjo2rrBQJw4w2XerUZad9Bnnj/C
+E+gAidE2Xdz6UaQId+BJ8P4FexxjJbwOz+qEx8lYyWt3ooqIfAbvyebFCRKSjFny
+L1chS4B8WuTPP+8UfPOcSoiOyXHtNqsWWLAIOcFwUUx27hF3IL2DvYi9zebO0uFO
+PiCp6QE0qQ/0HeDbnDjNmS7F8HPgx2IsJyEiEgYdR70w8n1DQB5ccekzpUDCBBNq
+W3q6OazE9V8ZdHjEA8FAJZ7Fo3cjgvkiVtow0CTiB7Aidya8HJc1KTemqUAAwLsT
+J3tGPHwu/RoCjpTvgbZcfT7vb+rMHYjlAaGfAe+dwgLq0XGn+id/ZdMf510=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAKxgqy7GuYcvyA/bSKh2g6NFUiCOMA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTAeFw0xNjAzMjUxMTAyMTla
+Fw0zNjAzMjUxMTAyMTlaMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLpj1x2QOzpy5P769ZzMDBWd/SB
+IamtFwi3yWpGNPFPxgFcRdH9srirVG/jCf8CV63xbqIFw5t5avllFx1sdGDexV0j
+xaikv3IEzUFuAdu1G/Y3gA6WT0Eaz3Wo539B6OMOWm/+S7LhtO92wEmD9QGEnzqK
+hWHafhLNIyatF6nRd8nW6qR1LIeWCJIc6+l9EIN7fgGv91F7qoUmdWWYFEbMaGjg
+aCU+G63qksrn8lme+qYu/mg7PLTkoGpWN5PDF1+ZJ+PWUauWF0BaHkZ1J/2oVBI9
+gTPRAcyapxI/vkbY76ntt9Tpds+ZnjgLt0UvglEHg62QfvjOqkDRn9INMr0CAwEA
+AaNlMGMwHQYDVR0OBBYEFMALZKbkq9w3sXzoVj19Ybn4iHoMMEIGA1UdEQQ7MDmC
+D3dlYmxvZ2luLmthdS5zZYYmaHR0cHM6Ly93ZWJsb2dpbi5rYXUuc2UvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFcnLl3I15O+8P1nbTwrl3ON7lYd
+maRmTTShHl3lUH87aRHbiyyoufQ9IZUVx7/lYr9R0956SXUeiXgrBwxGA7GFBR2g
+cOR0d99zxb5O5fp98Q2AsrNsfYkdkufrM07ro5kPUlAvmQyJSjoJ6eN6jn2nOJaQ
+wc5T0ouk9m5goKUJRK7mw6tRTVOw+3sA7Q8R6KW5Hge4uCCJVCnYXLAy/LR117A/
+zAjX3Z+Ui+HQajRXgxc1HyYHWJRnAzE2lb5na1/T6II0rInH7PMeqoUpmFWOOD86
+ZPI4RtsDWZUL5YWyHEokiQxtD9wZmhXrTUiHoVwbFjK+zfFpH/K4vhnweyw=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUGpvwFdQDTd5OR/3tImBGs68ViIIwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPd2VibG9naW4ua2F1LnNlMB4XDTE2MDMyNTExMDIyMFoX
+DTM2MDMyNTExMDIyMFowGjEYMBYGA1UEAwwPd2VibG9naW4ua2F1LnNlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlWvlRN7Q3Mh8KriChoB80l1JXzQw
+MthELvY6wwzf3fJ4VVIKFn0Kqql0JgwD/VOuA+MPbaqZDNWVcD5EmYhAs4k5cxSq
+jtb7RHdmAfTrnqB8XqM6wGP23sqa7brz7FDpT2kdCHkVn5Reazvltc4aUWepiXu4
+zDOd4fvyTwKcG4R2al6vPPg1ocvYOpOaaskNhjKk7KKF1fm233yLSiZZt/6yGipw
+EB/Vaj6+0ZOzmVCv8RFS5GiHroDzDRFquyrMKNXoqIVgcdsdq1ajeVazOvz+5p7k
+DonBQ31iphDxI3177QPWNIFy5VjvZoHzpiSIOHB7PEpJUkdfxlTS5Q6R6wIDAQAB
+o2UwYzAdBgNVHQ4EFgQUJNaYAquqKRGvgUZVPiWrZ0OSJI8wQgYDVR0RBDswOYIP
+d2VibG9naW4ua2F1LnNlhiZodHRwczovL3dlYmxvZ2luLmthdS5zZS9pZHAvc2hp
+YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAbsPfGxOUvMCzNS+ZIa+1woB7wRJH
+UdvS+jdnC86qB7pcfeUgqC+hWGzEQjeBpL31lrplfJq5j+c5E4AC97J11cCG7XP7
+6vZniOszZEvPnjI34OL4NrAs4VGSLeF7F9ZC8jyPdWEK2nan3ivWb5tIcfJzd1zp
+1amHFcKAlLVl8kMkLY1GB4kA+/Tz8epC0QDrgRHCdtgKmwfr1vbmAa6KmdldaBAa
+Cn3WZ3K74iMQSSbaR9g9oX/Ag+jeXkBCdEKknolZ+6FWVinu3oeuRiqvWYkLCF0Q
+cHgs7D1QiqGixbmFlSZyPcCPcIzPDzRaoXyb+yKQy31QP/VEt8VGXH5H2A==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">KAU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Karlstads universitet (ny)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Karlstad University (new)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Karlstad University</Company>
+    <SurName>IT-avdelningen</SurName>
+    <EmailAddress>mailto:webbteknik@kau.se</EmailAddress>
+    <TelephoneNumber>+46 54 700 2200</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>Karlstad University</Company>
+    <SurName>Paul Scott</SurName>
+    <EmailAddress>mailto:paul.scott@kau.se</EmailAddress>
+    <TelephoneNumber>+46 54 700 2307</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Karlstad University</Company>
+    <SurName>IT-avdelningen Karlstads universitet</SurName>
+    <EmailAddress>mailto:datasupport@kau.se</EmailAddress>
+    <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/weblogon.ltu.se-shibboleth.xml b/swamid-2.0/weblogon.ltu.se-shibboleth.xml
index ea10e038..4d4bf84c 100644
--- a/swamid-2.0/weblogon.ltu.se-shibboleth.xml
+++ b/swamid-2.0/weblogon.ltu.se-shibboleth.xml
@@ -91,7 +91,7 @@ JQ==
   <md:ContactPerson contactType="administrative">
     <md:Company>Luleå University of Technology</md:Company>
     <md:SurName>Servicedesk</md:SurName>
-    <md:TelephoneNumber>+46 920 491 664 </md:TelephoneNumber>
+    <md:TelephoneNumber>+46 920 491 664</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>Luleå University of Technology</md:Company>
@@ -102,6 +102,6 @@ JQ==
   <md:ContactPerson contactType="support">
     <md:Company>Luleå University of Technology</md:Company>
     <md:SurName>Servicedesk</md:SurName>
-    <md:TelephoneNumber>+46 920 491 664 </md:TelephoneNumber>
+    <md:TelephoneNumber>+46 920 491 664</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.ate.grayzone.ladok.se-gui-sp.xml b/swamid-2.0/www.ate.grayzone.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..7f28bb4a
--- /dev/null
+++ b/swamid-2.0/www.ate.grayzone.ladok.se-gui-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://www.ate.grayzone.ladok.se/gui-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla: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://www.ate.grayzone.ladok.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://www.ate.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok www.ate.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.ate.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://www.ate.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.ate.grayzone.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.ate.grayzone.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.ate.grayzone.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAOFbsjIjhL4IMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGXd3dy5hdGUuZ3JheXpvbmUubGFkb2suc2UwHhcNMTYwMzE0MTEwNTQ2WhcN
+MjYwMzEyMTEwNTQ2WjAkMSIwIAYDVQQDExl3d3cuYXRlLmdyYXl6b25lLmxhZG9r
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0n8ApDyLZ58CJBtW
+WtNfahUCB04p4a6toTAn9J2aX20HACHeJiOhNANcUGKCA2FRiuc7CjjITHRdmbQU
+bfR0efJrYeUtoksnSXREfbaJDFQATPYpnq2BMB1HSna2Cfv5SToHTgFE/46hO9Zg
+uq57w0HxMO9pqNggNG7I5IEhUF5+xihhPXHar1mYpjp3+zOdr+XJrIZ3Tq1nQPFA
+ZcKPSKFKfjA8lGqCImPCblPpg8Vgb7sPJiRHpVRpkLN9FSAGY1HW1gvtxFHe5TVy
+kgmrSbD07ejpIdOwIvt3mG5SpUmrt624TWqG/thU1zv3/PaiJ0i4zrPTZa5SNS8M
+GjnVpQIDAQABo3EwbzBOBgNVHREERzBFghl3d3cuYXRlLmdyYXl6b25lLmxhZG9r
+LnNlhihodHRwczovL3d3dy5hdGUuZ3JheXpvbmUubGFkb2suc2UvZ3VpLXNwMB0G
+A1UdDgQWBBS/KhR5h4DRaP0c+BZ8cDE8R8827zANBgkqhkiG9w0BAQsFAAOCAQEA
+HVLqnI/jDRO3StabYrvbavL23VbdKX/JDUV9vRam6uR+e6pbKb0xmP3F7P87WYIU
+iJoJ3xR3NKfXsWVI4BCR0auhieCZcSbQumClfQuCy6fXxvpmmq4qIrlxdb6W6lz/
+C8vTQEetpqdtNG6IB62TfYPe9io7TnAgJpzWzZVxjp7UoXhK8vPyMK60Gah3iKxA
+syYvZm/MaTEqMHF2oO64rqUoZuqRZCWE9VbbvNvN86pGnFWKgZRcBRpLWfSNAZHt
+AF5ZO1tO/syhzq3svhBKw43krQdg+z8EGBzqFTALxf+XE5JsNxLPO3APW9qEweX+
+pSPgM5nsisjeJf8vs4ejpA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.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.ate.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.ate.ladok.se-gui-sp.xml b/swamid-2.0/www.ate.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..0138a0b5
--- /dev/null
+++ b/swamid-2.0/www.ate.ladok.se-gui-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://www.ate.ladok.se/gui-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla: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://www.ate.ladok.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://www.ate.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok www.ate.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.ate.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://www.ate.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.ate.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.ate.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.ate.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAM9A/EFvH3nnMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNV
+BAMTEHd3dy5hdGUubGFkb2suc2UwHhcNMTYwMzE0MTMwMjUyWhcNMjYwMzEyMTMw
+MjUyWjAbMRkwFwYDVQQDExB3d3cuYXRlLmxhZG9rLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAxxDoG4YR72KYS1/uPqADYdCHQotCJ7x9cTxV0As1
+CdkVlaTKUdmy/p+ahzn043P19KYCPz7G9EMHWw3qhr0fqZMrGrewg07akree3zfI
+baQJD7phHiwQ8UGo2Q2lorInth3Ave4IlaC+rUBtvoa3LsqRCKxqwYuesNcmsO98
+3RxXY29DW5oCtE03rd8OdKtSrItmJ8mxvEH+hGtSb9oMgrhyXYgjGRGySlR0LnbP
+t7UpjQGjLp6TLbXoLHiDu4t2jxS/IcR85q532k1Qjhy+WjEwxcMg2Gn74NnpARl4
+N10huJFnopx8DDpVf9F6aacz8nF/5M9oZAZuZKJdBc+UOwIDAQABo18wXTA8BgNV
+HREENTAzghB3d3cuYXRlLmxhZG9rLnNlhh9odHRwczovL3d3dy5hdGUubGFkb2su
+c2UvZ3VpLXNwMB0GA1UdDgQWBBRPAFHovGUtyQwEvziKRmqJ8cbg3jANBgkqhkiG
+9w0BAQsFAAOCAQEAAUMLZd5+2AyiJL0mNgAt0hC+XR+8fnI91gUly8Q2uMtSdTMT
+vfIsygTpKkSgwm86DWRVLzHRXOGFhu+mAgVsQ0QE5p85ERoB58iGvRI4rcYtv0ie
+puPskX/E5j7gMRHaanBnP6X+vNQ08HEH3/m+Y7nolZkMtmKPlGuiGaHbghywy4WA
+zR3LAF9VtFJWm9tdt1FlP7R4goQAKJQpiV2PcYxyrzYd59SWE/Sa4ZNw04qh+HAv
+fbjk0oejOLjZ6uoEUjf9LLl6ie5zcFBQjXiTb+mXZUTbsy1FYNqYtXJmYNlxgZc3
+IS8RGYGqahuV0paHCbi4AHBtoYA6waPXxJVmKA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.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.ate.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ate.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ate.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ate.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ate.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ate.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.cvt.grayzone.ladok.se-gui-sp.xml b/swamid-2.0/www.cvt.grayzone.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..d0b7001a
--- /dev/null
+++ b/swamid-2.0/www.cvt.grayzone.ladok.se-gui-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://www.cvt.grayzone.ladok.se/gui-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla: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://www.cvt.grayzone.ladok.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://www.cvt.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok www.cvt.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.cvt.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://www.cvt.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.cvt.grayzone.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.cvt.grayzone.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.cvt.grayzone.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAKYg5cljlFfLMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGXd3dy5jdnQuZ3JheXpvbmUubGFkb2suc2UwHhcNMTYwMzE0MDg1MTUyWhcN
+MjYwMzEyMDg1MTUyWjAkMSIwIAYDVQQDExl3d3cuY3Z0LmdyYXl6b25lLmxhZG9r
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0SvPRcE2m0x356V7
+AYAJE3FFkqhJC2DRIh3V73qhu8bW0eEiP1biuAjefC43Mz71/OAMdcPYqbz1NZH0
+yWD8HLKtHgc2uLTHGyxDtmdz3Qx3siEXHThkxPZ6ULXuXxn5nTAiRotTgpev24kI
+Z5XW2EuOYbug0ffLS7fTx2YjHATuWtlukeicog5q3QA+NTYKRr3nSoUPyTmjwjxW
+vuBMLmgkZbEDK83EfejsnAagC9Gf4uBErzT1BWhJtvHMCFe8xWWcygmfczxHC3Ui
+1oeX5a6tmtbQpHXq5JGSICuw1MwExNTzYPcGlxQTi2EsNf4xFOsekLAg/vcRLoQf
+ERTtWQIDAQABo3EwbzBOBgNVHREERzBFghl3d3cuY3Z0LmdyYXl6b25lLmxhZG9r
+LnNlhihodHRwczovL3d3dy5jdnQuZ3JheXpvbmUubGFkb2suc2UvZ3VpLXNwMB0G
+A1UdDgQWBBQtwDy/NQNla4m2lX9LSz7dZv4jqDANBgkqhkiG9w0BAQsFAAOCAQEA
+fLPa5lVl8MWg+y4MW88Gyx6xJJ6VlPpp5Try8fveAHqg59aTsQP63slN9T/abEde
++EeYGf/wSjwpPvry80RXwjpvIAxrI8tCzrmPcA8AScio20D0nzQEFLNgrkKi0TZM
+bfOYldl4Zy2E7BO6FWutqVYQKa4yWfKP3gM2VUIhZlQ1ZnjOjZ/btmhgk9KvhHXo
+aanLruOHz1dPK5bxvsGAfgaccCbU6Nkx1x5cjKfdlbLBtsCPZynSL6uIT+Tsx/3/
+kOhM8gni3b9R6PzNrSgXKf9+4brfTmQTQTaXsbONluEx7VH7i93XTorzvczhi6mt
+7968+n/qrUu+uywa/Z0NuQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.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.cvt.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.cvt.ladok.se-gui-sp.xml b/swamid-2.0/www.cvt.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..f6a38a9d
--- /dev/null
+++ b/swamid-2.0/www.cvt.ladok.se-gui-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://www.cvt.ladok.se/gui-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla: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://www.cvt.ladok.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://www.cvt.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok www.cvt.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.cvt.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://www.cvt.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.cvt.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.cvt.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.cvt.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAKIBaYTXA/UKMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNV
+BAMTEHd3dy5jdnQubGFkb2suc2UwHhcNMTYwMzE0MTI1MDE3WhcNMjYwMzEyMTI1
+MDE3WjAbMRkwFwYDVQQDExB3d3cuY3Z0LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA1BtDJ0yOznNEjxYdreMZIj5PAp4XVHbVJ7SVUfXK
+qaaLntdnhfUu4j1HMTmJynODaTMmGU7WuToHFDSvS7hF8W+uNtHgTqZ6KCXJP43x
+xlUHhwJ6NgDyav4DHELDxx1gbvYsS8XSJFSdz5ndzQdE4JVjIEMzz1EH3VgUh5N3
+f0l1oW+t9+Y2hug/DR/xgiof6aC/WTfcRE5X3syL1eFDdi5HcLtuqwsIr2ye4Z53
+sNasbH+CqRk3rEuz0Xn2g1xUlVVmHUl1U8DH1bVDwNoGhooiL6UjrfBjPpjnIq1t
+KStatxJLwnEdvx1GEJBJ1OQBsKro2wVrXwAU3mC5cbegJQIDAQABo18wXTA8BgNV
+HREENTAzghB3d3cuY3Z0LmxhZG9rLnNlhh9odHRwczovL3d3dy5jdnQubGFkb2su
+c2UvZ3VpLXNwMB0GA1UdDgQWBBQrZwcdAGn4uy7Y0JnGewF0MM1TxjANBgkqhkiG
+9w0BAQsFAAOCAQEAVJevYxixFe9Tv2RuJ9tEoUnp2bUyN/48rL5oDGb7JSeCNbg1
+kROhWl0wEU/Yf1gY4RUGFy+IWXMDMDY9hJ7MZE0mNE2tyXtUHA7sCJXeuyjo2cCA
+eY2fmu0U60jbzZgahmxGdekdiDLeLAIJymhkGmMYT3v56KNr7DgqJ5HBdKKjFoRQ
+s1sd9atFeunYVqeqKSg3RpuOQfFtTNUReoCpsNyIvYIJD/Fii/eivqDDggaoSPRJ
+WnimKipRjtjA/SYLRR/nyoXAsQni3B9LlCSTmM5P6ydj8OgynYTf49JII2/kVohu
+y9GY07YaqJzsN7hRR+MqdDquFOn1kbK8mY+1EQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.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.cvt.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cvt.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cvt.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cvt.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.ete.grayzone.ladok.se-gui-sp.xml b/swamid-2.0/www.ete.grayzone.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..55b0bd07
--- /dev/null
+++ b/swamid-2.0/www.ete.grayzone.ladok.se-gui-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://www.ete.grayzone.ladok.se/gui-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla: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://www.ete.grayzone.ladok.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://www.ete.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok www.ete.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.ete.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://www.ete.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.ete.grayzone.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.ete.grayzone.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.ete.grayzone.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAOWFYTqhNVvCMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGXd3dy5ldGUuZ3JheXpvbmUubGFkb2suc2UwHhcNMTYwMzE0MTIxODQ0WhcN
+MjYwMzEyMTIxODQ0WjAkMSIwIAYDVQQDExl3d3cuZXRlLmdyYXl6b25lLmxhZG9r
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArVBzGuFoS+tskR5h
+j5riw+TYtVOEoRzhhYadhWtDdHcVXzDhlCRjxUJh5ZaGMs2HQoU4fsuDOtc1FSx4
+5zfvXPlxrp1dAR6gIyzw/S3c7O++Y/eFcnEHeIp6Qj19ewe1IA0O01sGOKMFavjn
+HMSNqYr2jph0C/LxJxOz3aGzyJf7QdEzL9P6kqT3P5ZvmQwhTG5USlW/MBHvHkPl
+CEU3q7f5iJAgwCFrx2B+kcj/rqOgF09qoBPRx6P+UPpDZAwQ2GRZr4oTxugJD/7x
+EkSq/Ih+CuysSvj49kvuPtnyv3NzQtHr0v6OztvJGJrIvdYp5y9/8tOfZk67zze8
++VXX9wIDAQABo3EwbzBOBgNVHREERzBFghl3d3cuZXRlLmdyYXl6b25lLmxhZG9r
+LnNlhihodHRwczovL3d3dy5ldGUuZ3JheXpvbmUubGFkb2suc2UvZ3VpLXNwMB0G
+A1UdDgQWBBSLSbmYVzYDUUSx6oMPSF6CSX8TujANBgkqhkiG9w0BAQsFAAOCAQEA
+V1eergR3PJpB8MDSKi1yO4WWf3elAcpn/OcLc58hoem1dqnfc64sPVpRfKcfYSiR
+FAjTvJm1tSkXpYvKwMAPdfguBHODF1abm6BTTHBXnDG5Be8HvLf/apMKcWhBRwMh
+xLjcVBsD2JROhF8RpT6hs10RLPblWk2uyI79bBTgKdt9gfHaf9zk2SwDT26ll5WI
+CrdOV1fuoBg7Y7hejnuxzA/HS+B0l+Dxp19N4gKRZa2bp5X1CK7ZUGXW5sW6VhYW
+N2btwps3PZrInQGW94xgXB5upuxNEzoWLHhRdzGOaeO2Za3FefwH5Lkc7wD0Nez1
+xOLd3/SRsYXlsa7ueYeKiw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.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.ete.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.grayzone.ladok.se-gui-sp.xml b/swamid-2.0/www.grayzone.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..f3e2aa08
--- /dev/null
+++ b/swamid-2.0/www.grayzone.ladok.se-gui-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://www.grayzone.ladok.se/gui-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla: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://www.grayzone.ladok.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://www.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok www.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://www.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.grayzone.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.grayzone.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.grayzone.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAJgL/UIUo864MA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
+BAMTFXd3dy5ncmF5em9uZS5sYWRvay5zZTAeFw0xNjAzMTQxMTQ2MDhaFw0yNjAz
+MTIxMTQ2MDhaMCAxHjAcBgNVBAMTFXd3dy5ncmF5em9uZS5sYWRvay5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK0c7tP+s8ifn2gZFh6FO6MIcFh7
+pwHh9ZnS1c+zdSLcI+VzUu8koV0o4JMKqr/o9hKMDkrd2EXRUiTux3+k0ePLWBMq
+6PnSjnCO4U/Pr0+ZKRfVI1KzDv7BPyv0lP5+AtS1UeLUe9SLiCsAsDyNcchDXDQE
+KOo9GiAsVUXFfedshhdN1iSXWetyL1aCdqZ4lYFzjYygnZ3Y+YEfKbcEAAnJVUD5
+joBuUJxCFyTB1oceCAJ2GXwRV+LNn/ZqYzfr4NLTcx3SEmxCLn+6L7xxY6P1+6j5
+xMMDN1VOy3i+ErYcoOeiqKadL3KKIY0jt9Cg9++x7zG3sd+j9Fudu/zWHFMCAwEA
+AaNpMGcwRgYDVR0RBD8wPYIVd3d3LmdyYXl6b25lLmxhZG9rLnNlhiRodHRwczov
+L3d3dy5ncmF5em9uZS5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFD9mG85cKreL
+30kUPNS51OTXyhm8MA0GCSqGSIb3DQEBCwUAA4IBAQAMopCEYdbeBSVMLnqjJpgv
+GaQY1SNtI20IHcfzDKJogzjv/4UVcUFUO0VCI1RFmD8E7DfEUD3EZuYoX6+QkdEA
+PpL4bkfkcE1yfH2y7TYkt/7nbXqNYg/Rpg6tUYceXyriBKpuZia61Bx3moNtIKCO
+18S4vOyjGvh9MTuGMM81eRP4ZO6cCPxIimd4jyK9F7cqh8reB1skvO9+ghiak5sg
+YXMU0kj/IDNQQ9Hr2tj8e88rT15DRmjRI3dCCdrQ3geW+ZZkMm+bPdV1vfHGvG8+
+0yEVh0F2lpMEqdwLpcmqO8+/usorbJxs69tTG93PVbL3Oe3LfjV0EXKnwQkmlbRA
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.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.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.led.aitp.ladok.se-gui-sp.xml b/swamid-2.0/www.led.aitp.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..4907d16e
--- /dev/null
+++ b/swamid-2.0/www.led.aitp.ladok.se-gui-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://www.led.aitp.ladok.se/gui-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla: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://www.led.aitp.ladok.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://www.led.aitp.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok www.led.aitp.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.led.aitp.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://www.led.aitp.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.led.aitp.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.led.aitp.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.led.aitp.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAMUfZRVa09jzMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
+BAMTFXd3dy5sZWQuYWl0cC5sYWRvay5zZTAeFw0xNjAzMjIxMTA4MDFaFw0yNjAz
+MjAxMTA4MDFaMCAxHjAcBgNVBAMTFXd3dy5sZWQuYWl0cC5sYWRvay5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMtG+Q8i/hPsbBuTqfnOIp4S33oH
+bNRDy01jqfvbUFHhA+2lGTBRc/TGNOeLu5kns2pGWywJNPP47fgT2VaiDt6mXT9a
+naZ/aq+yz2vX60bbBK55ycj/5YSNrbU30dgaZf6DVDK3BA9VLd06op/QowTcpBFY
+OQ4BokuBDrNiGNmmzvC7zfS2ol8FI/9skBSxDOsdkcv77GhdWWlq1EyYmTCnz8JT
+37/gRBOM8g1iugZ058FooiImJWzfMtZ7IyilQXh8WJNoQm1sAjTljlxo6NxzIZxF
+6N0HTb0wejShNJkDcha5B+5UEZMSCKc53Q2XoWO1nG6OGDiq4sDQSbJQJC8CAwEA
+AaNpMGcwRgYDVR0RBD8wPYIVd3d3LmxlZC5haXRwLmxhZG9rLnNlhiRodHRwczov
+L3d3dy5sZWQuYWl0cC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFCYLPvWoJQWG
+JHUKjcUb2JR7e5IAMA0GCSqGSIb3DQEBCwUAA4IBAQCu37xA3486vgJwXj0ZDbB2
+BlODSSwfxmkugdf8IKrQQsk5zFrT0/Ez2MjPx6hsKAKYrWUTBGzdVgg6oACoF9yM
+6PZ9mV6XzWywBQyiGiKNEs+PpoHYg445EAoZpTqdAZTqPlXZzKsulFg6Er7zEWyJ
+ukUHPqvjMUAY+beToQjKgLL7oay8gGowEGydjGwhfWBtJNa0UaJTNAFgp2xwstr+
+gelT1txaGK/dEbOeftFEIdjdNq+hGCO0GencBeBoYWZUOoRzjP1QzKKAZr+Ye2Z+
+ki90GX1MA+hLqpfsqu2H1anHzoSwUXaJ0oc8vhnOnAv4Ib84PRvvYxfO3zJMNwDD
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.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.led.aitp.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Hans</md:GivenName>
+    <md:SurName>Sandstén</md:SurName>
+    <md:EmailAddress>mailto:hans.sandsten@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.test.grayzone.ladok.se-gui-sp.xml b/swamid-2.0/www.test.grayzone.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..05d79d3e
--- /dev/null
+++ b/swamid-2.0/www.test.grayzone.ladok.se-gui-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://www.test.grayzone.ladok.se/gui-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla: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://www.test.grayzone.ladok.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://www.test.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok www.test.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.test.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://www.test.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.test.grayzone.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.test.grayzone.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.test.grayzone.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIJAMP0BTvafynIMA0GCSqGSIb3DQEBCwUAMCUxIzAhBgNV
+BAMTGnd3dy50ZXN0LmdyYXl6b25lLmxhZG9rLnNlMB4XDTE2MDMxNDA4NTMyMloX
+DTI2MDMxMjA4NTMyMlowJTEjMCEGA1UEAxMad3d3LnRlc3QuZ3JheXpvbmUubGFk
+b2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCT4AnqNkQ9YTwA
+uJQ1J+xHn/XkyKOGrnnvr3ELgMZNC9FCbb4T6WwsUMJbxdICG8SY+l9+VS7yhEXz
+ZS252ilRyEDf5B9/gjvUosaNvoi2zPyXJWKsEXEj9dqTqOqpYBgVs15bOoh2NdVI
+uocLPJLzy3ot2gBG/sfH91mNeryQ6KxoMlEemZEe8ITh5wJFvTuukrzo08P1QbP0
+40AH6EzSyfZLIfyht75TNmJXQHVK8ECl9EtzAARJhH8JTw2BhYFEtnm6WiVLfStN
+shnKJXLoOaJxNK1cU0DOdOMnDtuO04CN0edU+lQmXlIJEveTP4qS1TldHvELZJ/R
+8zw9Dce/AgMBAAGjczBxMFAGA1UdEQRJMEeCGnd3dy50ZXN0LmdyYXl6b25lLmxh
+ZG9rLnNlhilodHRwczovL3d3dy50ZXN0LmdyYXl6b25lLmxhZG9rLnNlL2d1aS1z
+cDAdBgNVHQ4EFgQUzi69O/vgiRvYYrKqVi5cPDNYR7AwDQYJKoZIhvcNAQELBQAD
+ggEBADskNl+vv7YpipCp40BgN166XnBcfTilZvaN8yZ0XPARWTx1v84n4qERUw+s
+L3swnWDKTQ0bx8pn8LFVcgDX56onTNBMRzqNmJ0Bv1tgo8bVXk9Q0qPz/ANrx5TP
+RDeU+wX6TCxr2d0ggvqwaWQKQKK2y7Z9ij4ccimPSvdZBqRiGPjVaGKCB4hzotdZ
+Fyb7Q2VzAorfD08QY9JIvT5Tv8P2xDxZHK/2l/QX/bDqUT+jY5wzW0ksFghkkPZD
+DD5IhrCh9D0g84j5WdUrRQS4/aT4nXGsSVLHkmAfsw0K23BDmU2hjhSqsoiyA470
+75H9o1PKSvHR9qX0uJ8HbrBxU54=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.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.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.utb.grayzone.ladok.se-gui-sp.xml b/swamid-2.0/www.utb.grayzone.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..a7c8fe62
--- /dev/null
+++ b/swamid-2.0/www.utb.grayzone.ladok.se-gui-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://www.utb.grayzone.ladok.se/gui-sp">
+  <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"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla: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://www.utb.grayzone.ladok.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://www.utb.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok www.utb.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.utb.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://www.utb.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.utb.grayzone.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.utb.grayzone.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.utb.grayzone.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAJPZjxg5+NvsMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGXd3dy51dGIuZ3JheXpvbmUubGFkb2suc2UwHhcNMTYwMzE0MTEzNTAwWhcN
+MjYwMzEyMTEzNTAwWjAkMSIwIAYDVQQDExl3d3cudXRiLmdyYXl6b25lLmxhZG9r
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyrtmI0m3IVrZcnzO
++WFroBzzRtKcBRS3T+jrdamvtpcIWGuJVBuk9dRpDGwIaIxscdg67mye0ZOJZ6YS
+LqBxqz41/pD5PPc7skomgQO5zuTYJK3bV8DQpWVJqcZS2ulFtihCunAIryifab0x
+YFdqV1BMpgYlnW0W4ijNNyEiXTmTzgaaNuEU5p3jJV3csXI7nR4PDvK7+3p1HInv
+cvLpgwGAb5hHulY+VrkQ0ahuCtcXnjDrPi7zrz9YhCNvHHTrEj5gSldQNMA4vP+F
+gtD9mzoewXF6ohZ5SKY4O75adzOMG3KC49KO2iStqVns17W3G/77Ur8lBox/LpRa
+JHZHGwIDAQABo3EwbzBOBgNVHREERzBFghl3d3cudXRiLmdyYXl6b25lLmxhZG9r
+LnNlhihodHRwczovL3d3dy51dGIuZ3JheXpvbmUubGFkb2suc2UvZ3VpLXNwMB0G
+A1UdDgQWBBSJ4KTf8+bflcMvJIakk+0CeJ1PGTANBgkqhkiG9w0BAQsFAAOCAQEA
+AOd9wK2YEAzyMSLLtiYH7LREWEbV/ZBJpUdEK1Lz9tM3jSIcZs/4cM2L5uTiJ3GL
+MW/lRZGA2UZuOy87eiN61PUXHF6P2cGtbNJiR3xwCUlsFpt3qtAW1ymI234hTbHD
+8VjClW1t4yrjtb9OY86EsyWlidl5TVFKA5lpA6gUhLb3esommGRobpTl7sjswwO9
+wpcYuvyt6attK8W6TOzPRnV+4jUjGCG+YIoZPx6/avKmzgbzVBP8MDjIgaFO9cWz
+2UEGOUva3jtbUucaTmwcoqTtGDrJHawS4Vx+/PuAFIyUwGgMsp88D7OpjzfOA48p
+dzE8INr6mv2sLjkxoHRQ1w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.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.utb.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.utb.resultat.ladok.se-gui-sp.xml b/swamid-2.0/www.utb.resultat.ladok.se-gui-sp.xml
index ec21fa4d..45b8092e 100644
--- a/swamid-2.0/www.utb.resultat.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.utb.resultat.ladok.se-gui-sp.xml
@@ -31,7 +31,7 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Ladok www.ate.ar.ladok.se</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Ladok www.ate.ar.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok) </mdui:Description>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
         <mdui:Logo height="64" width="64">https://www.ate.ar.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
       </mdui:UIInfo>
diff --git a/swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml b/swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml
index 35b39fb5..27db27bd 100644
--- a/swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml
@@ -20,7 +20,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue> http://www.swamid.se/category/research-and-education </samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -31,10 +31,10 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Ladok www.utb.uppfoljning.ladok.se</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Ladok www.utb.uppfoljning.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv"> Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en"> Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Logo height="64" width="64"> https://www.utb.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+        <mdui:Logo height="64" width="64">https://www.utb.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 4dbe9fdc..6998c838 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -31,7 +31,6 @@
   <xi:include href="swamid-2.0/idp.konstfack.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.rkh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.kmh.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.lu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.kva.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.esh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kiidp.ki.se-idp-shibboleth.xml"/>
@@ -51,4 +50,6 @@
   <xi:include href="swamid-2.0/login.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.ths.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml"/>
+  <xi:include href="swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml"/>
+  <xi:include href="swamid-2.0/idpv3.lu.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index c6e3c65c..aad6e0a0 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -7,5 +7,5 @@
   <!-- Opt-out from eduGAIN IDP:s -->
   <xi:include href="swamid-2.0/shibboleth.antagning.se-shibboleth-idp.xml"/>
   <xi:include href="swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idpv3.lu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.lu.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index e7b15bb0..a1e6388b 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -200,8 +200,10 @@
       <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">hof.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">holmestrand.kommune.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>
diff --git a/swamid-interfederations-1.0/terena.org-sp.xml b/swamid-interfederations-1.0/terena.org-sp.xml
index 7bad600c..26ecd068 100644
--- a/swamid-interfederations-1.0/terena.org-sp.xml
+++ b/swamid-interfederations-1.0/terena.org-sp.xml
@@ -22,7 +22,7 @@
         <mdui:Description xml:lang="en">A service provider proxy for all GÉANT federated services</mdui:Description>
         <mdui:InformationURL xml:lang="en">https://wiki.geant.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.geant.org/Policies</mdui:PrivacyStatementURL>
-        <mdui:Logo height="73" width="175">https://login.terena.org/wayf/module.php/terena/gfx/New_GEANT_logo.jpg</mdui:Logo>
+        <mdui:Logo width="175" height="73">https://login.terena.org/wayf/module.php/terena/gfx/New_GEANT_logo.jpg</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index 4cd28100..8f5c8259 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -127,6 +127,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index 3d7a3ba0..6072f4e4 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -8,10 +8,11 @@
 <xi:include href="swamid-interfederations-2.0/aai.arnes.si-test-edugain.xml"/>
 <xi:include href="swamid-interfederations-2.0/aai.certh.gr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/aai.helmholtz-muenchen.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai.idiap.ch-idp-shibboleth.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.insel.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-login.ehb-schweiz.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.hsr.ch-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml"/>
@@ -24,6 +25,7 @@
 <xi:include href="swamid-interfederations-2.0/aai-logon.hcmr.gr-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-qm.its.unibas.ch-idp-shibboleth.new.xml"/>
 <xi:include href="swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/aai-logon.unibas.ch-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/aai-logon.uni.li-idp-shibboleth.xml"/>
@@ -46,6 +48,7 @@
 <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/aci-bookings.sisoshibboleth.co.uk-entity.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.kempel.nl-adfs-services-trust.xml"/>
@@ -108,6 +111,7 @@
 <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/aplicacions.usc.es-sir-uscidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/app-ca.tophat.com-sso-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"/>
@@ -138,6 +142,7 @@
 <xi:include href="swamid-interfederations-2.0/atlases.muni.cz-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/atlas.sciencespo-lille.eu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/atrium.in2p3.fr-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/attributes.dfn.de-shibboleth.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/audit01.ncl.ac.uk-shibboleth-metadata.xml"/>
@@ -246,7 +251,6 @@
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml"/>
@@ -317,6 +321,7 @@
 <xi:include href="swamid-interfederations-2.0/cafe.ufcspa.edu.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.ufpel.edu.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"/>
@@ -338,7 +343,6 @@
 <xi:include href="swamid-interfederations-2.0/cascade.accessiblelearning.com-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/cas.cgcent.miami.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/cas.conncoll.edu-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/cassiopee.ac-nice.fr-idp-shibboleth.xml"/>
@@ -377,6 +381,7 @@
 <xi:include href="swamid-interfederations-2.0/commons.lbl.gov-sp-shibboleth.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/compass.astm.org-sp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/compute.deic.dk.xml"/>
 <xi:include href="swamid-interfederations-2.0/conext.authenticatie.ru.nl-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/confluence.dev.ja.net-shibboleth.xml"/>
@@ -396,6 +401,7 @@
 <xi:include href="swamid-interfederations-2.0/csbmth.sisoshibboleth.co.uk-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/csueastbay.infoready4.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/csun.infoready4.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/csus.infoready4.com-shibboleth.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"/>
@@ -440,13 +446,13 @@
 <xi:include href="swamid-interfederations-2.0/dev.qmplus.qmul.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/devsaas.topdeskdev.net-tas-secure-login-verify.xml"/>
 <xi:include href="swamid-interfederations-2.0/dev.scotlandonscreen.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev.screeningshorts.org.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/devsso.educause.edu-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/dev-sso.knewknovel.com-entry-uk_federation-Metadata.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/discourse.sci-gaia.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/dl.acm.org-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/dldev.acm.org-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml"/>
@@ -494,15 +500,14 @@
 <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/eduid.jamu.cz-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/ed.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-secure-login-verify.xml"/>
 <xi:include href="swamid-interfederations-2.0/eduroam.frizerska.si.xml"/>
 <xi:include href="swamid-interfederations-2.0/eduspot.crous-amiens.fr-authsaml2-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/eduspot-n.oca.eu-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/efoyer.glam.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/eka-idp.lanet.lv.xml"/>
@@ -552,7 +557,6 @@
 <xi:include href="swamid-interfederations-2.0/federacao.ifpi.edu.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/federacao.uvanet.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/federatie.clusius.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/federatie.graafschapcollege.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/federatie.lumc.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/federatie.trimbos.nl-adfs-services-trust.xml"/>
@@ -568,7 +572,6 @@
 <xi:include href="swamid-interfederations-2.0/federation.cyclone-project.eu-auth-realms-master.xml"/>
 <xi:include href="swamid-interfederations-2.0/federation.cyclone-project.eu-samlbridge-module.php-saml-sp-metadata.php-cyclone-saml-bridge.xml"/>
 <xi:include href="swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/federation.hdh.nl-adfs-services-trust.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"/>
@@ -590,7 +593,6 @@
 <xi:include href="swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/fed-interop-wg.ligo.org-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/fed.nusextra.co.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/fed.rijnijssel.nl-adfs-services-trust.xml"/>
@@ -604,11 +606,9 @@
 <xi:include href="swamid-interfederations-2.0/fim.temple.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/fiuidp.fiu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/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/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/fsdev.iceruganda.org-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml"/>
@@ -687,6 +687,7 @@
 <xi:include href="swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml"/>
@@ -750,7 +751,6 @@
 <xi:include href="swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp3.cereq.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp3.kirkleescollege.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp3.leeds.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp3-test.is.ed.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.4cd.edu-idp-shibboleth.xml"/>
@@ -779,11 +779,8 @@
 <xi:include href="swamid-interfederations-2.0/idp.ariadne-t.gr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.arts.ac.uk-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ashridge.org.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aspete.gr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.asu.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.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.aua.gr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.aub.edu.lb-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.aucb.ac.uk-oala-metadata.xml"/>
@@ -964,6 +961,7 @@
 <xi:include href="swamid-interfederations-2.0/idp.edinburghcollege.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.educause.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ehesp.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ekt.gr-idp-shibboleth.xml"/>
@@ -1020,6 +1018,7 @@
 <xi:include href="swamid-interfederations-2.0/idp.gla.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.gli.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpglyndwr.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.gmit.ie-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.godalming.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml"/>
@@ -1070,6 +1069,7 @@
 <xi:include href="swamid-interfederations-2.0/idp.iastate.edu-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ibot.cas.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ibp.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ibt.cas.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.icpf.cas.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.identity.uoguelph.ca-idp-shibboleth.xml"/>
@@ -1081,6 +1081,7 @@
 <xi:include href="swamid-interfederations-2.0/idp.ifs.org.uk-openathens.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ihe.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml"/>
@@ -1175,13 +1176,13 @@
 <xi:include href="swamid-interfederations-2.0/idp.mbu.cas.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.mci4me.at-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.merit.edu.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.merthyr.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.metropolia.fi-idp.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.mf.uni-lj.si-idp-20111101.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.mic.ul.ie-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.midchesh.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.millersville.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.mimas.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.mines.edu-idp-shibboleth.xml"/>
@@ -1240,6 +1241,7 @@
 <xi:include href="swamid-interfederations-2.0/idp.parchment.com-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.parliament.uk-openaccess.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.pct.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.pembrokeshire.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.pennkey.upenn.edu-idp-shibboleth.xml"/>
@@ -1249,6 +1251,7 @@
 <xi:include href="swamid-interfederations-2.0/idp.plumpton.ac.uk-openathens.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.plymouthart.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.politecnica.edu.co-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.polytechnique.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.port.ac.uk-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml"/>
@@ -1304,7 +1307,6 @@
 <xi:include href="swamid-interfederations-2.0/idp.scng.si-idp-20130321.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.scptuj.si-idp-20111102.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.sdsu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.sfsu.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.sgscol.ac.uk-idp-shibboleth.xml"/>
@@ -1324,7 +1326,6 @@
 <xi:include href="swamid-interfederations-2.0/idp.si.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.slcollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.smu.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.soas.ac.uk-entity.xml"/>
@@ -1438,6 +1439,7 @@
 <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.udc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.uel.ac.uk-shibboleth.xml"/>
@@ -1551,6 +1553,7 @@
 <xi:include href="swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.uxbridge.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idpv3.essingtoncc.co.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.vfu.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml"/>
@@ -1570,6 +1573,7 @@
 <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.winchester.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.wit.ie-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.wlu.ca-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.wm.edu-idp-shibboleth.xml"/>
@@ -1629,7 +1633,6 @@
 <xi:include href="swamid-interfederations-2.0/its-shib.its.csulb.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/janus.cnrs.fr-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/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/jenkins.ukfederation.org.uk-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/jidp.jlab.org-idp-shibboleth.xml"/>
@@ -1638,7 +1641,6 @@
 <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/judge.wcu.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/junebug.mcc.edu-idp-shibboleth.xml"/>
@@ -1668,7 +1670,6 @@
 <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/libauth.com-saml-module.php-saml-sp-metadata.php-springy-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/library.qub.ac.uk-shibboleth-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/library-test.lancs.ac.uk-idp-shibboleth.xml"/>
@@ -1700,14 +1701,12 @@
 <xi:include href="swamid-interfederations-2.0/login.cmu.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.emerson.edu-idp.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.emory.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.ewu.edu-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.fandm.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.fanshawec.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.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.figshare.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.figsh.com-shibboleth.xml"/>
@@ -1719,6 +1718,7 @@
 <xi:include href="swamid-interfederations-2.0/login-idp.auth.gr-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.jyu.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.library.dmu.ac.uk-oala-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.ligo.org-idp-shibboleth.xml"/>
@@ -1752,6 +1752,7 @@
 <xi:include href="swamid-interfederations-2.0/login.ucs.ac.uk-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.uea.ac.uk-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.ufl.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.umt.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.unlv.edu-FIM-sps-MyShib-saml20.xml"/>
@@ -1820,6 +1821,7 @@
 <xi:include href="swamid-interfederations-2.0/newcastle.kit-catalogue.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/newcastle-shib.hosted.exlibrisgroup.com-shib.xml"/>
 <xi:include href="swamid-interfederations-2.0/new-primo.hosted.exlibrisgroup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/nhs-shib.hosted.exlibrisgroup.com-shib.xml"/>
 <xi:include href="swamid-interfederations-2.0/nlw-shib.hosted.exlibrisgroup.com-shib.xml"/>
 <xi:include href="swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/notify.ncl.ac.uk-shibboleth-metadata.xml"/>
@@ -1832,6 +1834,7 @@
 <xi:include href="swamid-interfederations-2.0/oa.globaldata.com-oa-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/oa-idp22.wlv.ac.uk-oala-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/oa-idp.wlv.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/oa.kluwerlawonline.com-oa-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/oala-dev.leedsbeckett.ac.uk-oala.xml"/>
 <xi:include href="swamid-interfederations-2.0/oala.leedsbeckett.ac.uk-oala.xml"/>
@@ -1844,7 +1847,6 @@
 <xi:include href="swamid-interfederations-2.0/oa.sagepub.com-oa-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/oasp-omicron.athensams.net-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/oba.coppin.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/obu-shib.hosted.exlibrisgroup.com-shib.xml"/>
 <xi:include href="swamid-interfederations-2.0/olasdev.e-skillz.com-simplesaml.xml"/>
@@ -1860,8 +1862,6 @@
 <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.warc.com-oa-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/openathens.xperthr.co.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml"/>
@@ -1872,7 +1872,6 @@
 <xi:include href="swamid-interfederations-2.0/osms.maps-ict.com.xml"/>
 <xi:include href="swamid-interfederations-2.0/ota.oerc.ox.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/ousu.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/oxfordbrookes.idm.oclc.org-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/oxford.corefacilities.org-account-saml-oxford.xml"/>
@@ -1895,6 +1894,7 @@
 <xi:include href="swamid-interfederations-2.0/portal.edu-host.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/ppms.eu-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/pp.webauth.soton.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/prdidp.uncg.edu-idp-shibboleth.xml"/>
@@ -1982,6 +1982,7 @@
 <xi:include href="swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/samlidp-its.ocad.ca-8443-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml.lynda.com.xml"/>
 <xi:include href="swamid-interfederations-2.0/saml.nelnet.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/saml.psui.geant.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml"/>
@@ -2040,9 +2041,7 @@
 <xi:include href="swamid-interfederations-2.0/shib2idp.rgu.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib2.its.rochester.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib2.swmed.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib2.utep.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib4.rowan.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib.alexanderstreet.com-shibboleth-sp.xml"/>
@@ -2068,6 +2067,7 @@
 <xi:include href="swamid-interfederations-2.0/shibboleth2sp.cab.semcs.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth2sp.col.semcs.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth2sp.gar.semcs.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.ios.semcs.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth2sp.mhp.semcs.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth2sp.pm.semcs.net-shibboleth.xml"/>
@@ -2096,6 +2096,7 @@
 <xi:include href="swamid-interfederations-2.0/shibboleth.c2kqa.net-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.cambridge.org-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.camsfc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.carshalton.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.cavc.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml"/>
@@ -2105,7 +2106,6 @@
 <xi:include href="swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.coconino.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.cranfield.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.csuchico.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.csustan.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml"/>
@@ -2174,7 +2174,6 @@
 <xi:include href="swamid-interfederations-2.0/shibboleth.louisville.edu-idp.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.lsbu.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.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.mh-hannover.de-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.midkent.ac.uk-shibboleth.xml"/>
@@ -2192,7 +2191,6 @@
 <xi:include href="swamid-interfederations-2.0/shibboleth.plumpton.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.plymouth.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.rcn.org.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.riversidecollege.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.runshaw.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.salisbury.edu-idp-shibboleth.xml"/>
@@ -2226,6 +2224,7 @@
 <xi:include href="swamid-interfederations-2.0/shibboleth.ulbra.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.umich.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.unesp.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.uni.opole.pl-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.unisi.it-idp-shibboleth.xml"/>
@@ -2243,6 +2242,7 @@
 <xi:include href="swamid-interfederations-2.0/shibboleth.utb.cz-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.uwyo.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbolethv3.ac-limoges.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.vcu.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.webassign.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.webbased.co.uk-shibboleth.xml"/>
@@ -2265,6 +2265,7 @@
 <xi:include href="swamid-interfederations-2.0/shib.calu.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib.ccbcmd.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.courseleaf.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib.csub.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibdev2.stir.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib-dev-idp.ucl.ac.uk-shibboleth.xml"/>
@@ -2299,7 +2300,6 @@
 <xi:include href="swamid-interfederations-2.0/shibidp.syr.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibidp.tameside.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib-idp.tufts.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib-idp.ucl.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibidp.uclan.ac.uk-idp-shibboleth.xml"/>
@@ -2317,11 +2317,9 @@
 <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.its.fsu.edu-idp-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.lternet.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib.lynda.com-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib.lythamsixth.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml"/>
@@ -2349,7 +2347,6 @@
 <xi:include href="swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shib-sp.mediacore.tv.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibsp.proofidcloud.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/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/shib-staging.data-archive.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibtest.ex.ac.uk-idp-shibboleth.xml"/>
@@ -2391,6 +2388,7 @@
 <xi:include href="swamid-interfederations-2.0/signin.studentmoneysaver.co.uk.xml"/>
 <xi:include href="swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/singlesignon.gwu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/si-saai.ualg.pt-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sistemas.uepg.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/skmms-idp.lanet.lv.xml"/>
@@ -2500,11 +2498,13 @@
 <xi:include href="swamid-interfederations-2.0/srvcafe.uniso.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/srv-fii.insa-toulouse.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/srv-idp-01.uffs.edu.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/srvshibboleth.asfc.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sse-idp.lanet.lv.xml"/>
 <xi:include href="swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.artstor.org-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.augsburg.edu-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.bl.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.brockport.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.brown.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.bsfc.ac.uk-idp-shibboleth.xml"/>
@@ -2515,12 +2515,12 @@
 <xi:include href="swamid-interfederations-2.0/sso.csumb.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.davidson.edu-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso-demo.proofidcloud.co.uk-idp-pingfederate.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.ecu.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso-ed.datamonitor.com-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.educause.edu-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.eur.nl-opensso.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.fau.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.fh-salzburg.ac.at-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.ft.com-sso-sp-oa-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.han.nl-ssp.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.hsc.edu-adfs-services-trust.xml"/>
@@ -2584,6 +2584,7 @@
 <xi:include href="swamid-interfederations-2.0/sts.tue.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/sts.uidaho.edu-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml"/>
 <xi:include href="swamid-interfederations-2.0/sts.wur.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/sts.zadkine.nl-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/studentstore.phoenixs.co.uk-shibboleth.xml"/>
@@ -2606,11 +2607,16 @@
 <xi:include href="swamid-interfederations-2.0/tc-web-04.groupgti.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/terena.org-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-secure-login-verify.xml"/>
 <xi:include href="swamid-interfederations-2.0/test-auth.galegroup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/testbed.tier.internet2.edu-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.ed.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ed.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ed.unidesk.ac.uk-tas-secure-login-verify.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml"/>
 <xi:include href="swamid-interfederations-2.0/testidp1.ntu.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test-idp.dante.net-idp-shibboleth.xml"/>
@@ -2619,9 +2625,10 @@
 <xi:include href="swamid-interfederations-2.0/test.ingentaconnect.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.j2e.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.myplace.strath.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-secure-login-verify.xml"/>
 <xi:include href="swamid-interfederations-2.0/testoala.surrey.ac.uk-oala-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.openathens.net-oala-metadata.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"/>
@@ -2629,14 +2636,22 @@
 <xi:include href="swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test-secure.palgrave-journals.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.shu.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-secure-login-verify.xml"/>
 <xi:include href="swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test-sp.ihs.com-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-secure-login-verify.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.stir.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-secure-login-verify.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.ufit.onecampus.com.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-secure-login-verify.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.vpp.midlands3cities.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.worldbank.pub2web.ingenta.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/teton.accessiblelearning.com-sp.xml"/>
@@ -2651,6 +2666,7 @@
 <xi:include href="swamid-interfederations-2.0/tophat.com-sso-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/topsy.ncl.ac.uk-shibboleth-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/training.nicurriculum.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/trshibtest.falmouth.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/tullbommen.arcada.fi-simplesaml-.xml"/>
 <xi:include href="swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/uat-adfs.geant.net-adfs-services-trust.xml"/>
@@ -2726,7 +2742,6 @@
 <xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-liv.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.test.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml"/>
@@ -2756,7 +2771,6 @@
 <xi:include href="swamid-interfederations-2.0/urn-mace-incommon-mlml.calstate.edu.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-incommon-msu.edu.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-incommon-muohio.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-incommon-nau.edu.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ncsu.edu.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-incommon-nih.gov.xml"/>
@@ -2809,6 +2823,7 @@
 <xi:include href="swamid-interfederations-2.0/urn.nbi.ku.dk-saml-sp-wayf.xml"/>
 <xi:include href="swamid-interfederations-2.0/urz-cf9dev.urz.unibas.ch-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/usertest.sciquest.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/us.ready.kuali.co-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/uthscsa.infoready4.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/utwente.nl-.xml"/>
 <xi:include href="swamid-interfederations-2.0/uwgb.edu-idp.xml"/>
@@ -2849,6 +2864,7 @@
 <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/webanno.sfs.uni-tuebingen.de.xml"/>
 <xi:include href="swamid-interfederations-2.0/webauth.auburn.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/webauth.cmc.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/webauth.meredith.edu-idp-shibboleth.xml"/>
@@ -2875,6 +2891,7 @@
 <xi:include href="swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/wiki-cswarm.crc.nd.edu-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki.idem.garrservices.it-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/wiki.larpp.internet2.edu-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml"/>
@@ -2882,6 +2899,7 @@
 <xi:include href="swamid-interfederations-2.0/wiki.research.data.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/wikispaces.psu.edu-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/wiseflow.dk.xml"/>
 <xi:include href="swamid-interfederations-2.0/wpkfl-shibidp.fullsail.com-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/wsso.vscht.cz-idp-shibboleth.xml"/>
@@ -2921,7 +2939,6 @@
 <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.clarin-pl.eu-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.climatescience.cam.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.clinicalskills.net-oa-metadata.xml"/>
@@ -3130,6 +3147,7 @@
 <xi:include href="swamid-interfederations-2.0/zbgva-edusso.zettabox.com-core-AuthServices.xml"/>
 <xi:include href="swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it-12081-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml
index d6cd528a..95746f16 100644
--- a/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
 <?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="2016-03-15T06:04:06Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-03T17:33:26Z">
       <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">
@@ -41,42 +41,6 @@
       <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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
 MIIG+zCCBeOgAwIBAgIUOrQAYeOcXpth7KRM0gOthXuLykAwDQYJKoZIhvcNAQEL
 BQAwSTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
 BgNVBAMTFlF1b1ZhZGlzIEVWIFNTTCBJQ0EgRzEwHhcNMTYwMzE0MDkzOTU0WhcN
@@ -137,42 +101,6 @@ OWYmXxDUP7ZGWaUb03p4m7YDFL0QLtLrUpB63cfhPXb6LW1dBwh3sfo1B0rnpObr
       <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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
 MIIG+zCCBeOgAwIBAgIUOrQAYeOcXpth7KRM0gOthXuLykAwDQYJKoZIhvcNAQEL
 BQAwSTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
 BgNVBAMTFlF1b1ZhZGlzIEVWIFNTTCBJQ0EgRzEwHhcNMTYwMzE0MDkzOTU0WhcN
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
index 39fc9a31..37ae1476 100644
--- a/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
 <?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="2016-03-04T05:43:26Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-04T08:58: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">
@@ -97,6 +97,7 @@ M5r00gwrZAVynl2Imw==
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
@@ -105,6 +106,59 @@ M5r00gwrZAVynl2Imw==
     <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:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uzh.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIGyTCCBbGgAwIBAgIUaP2onvcn8JF3V2Rgtd4Y3DPdls0wDQYJKoZIhvcNAQEL
+BQAwSTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+BgNVBAMTFlF1b1ZhZGlzIEVWIFNTTCBJQ0EgRzEwHhcNMTYwMTE5MDk0MDE5WhcN
+MTgwMTE5MDk1MDAwWjCByTETMBEGCysGAQQBgjc8AgEDEwJDSDEYMBYGCysGAQQB
+gjc8AgECDAdadWVyaWNoMRowGAYDVQQPDBFHb3Zlcm5tZW50IEVudGl0eTETMBEG
+A1UEBRMKMTgzMi0wOS0yODELMAkGA1UEBhMCQ0gxEDAOBgNVBAgMB1p1ZXJpY2gx
+EDAOBgNVBAcMB1p1ZXJpY2gxHTAbBgNVBAoMFFVuaXZlcnNpdGFldCBadWVyaWNo
+MRcwFQYDVQQDDA5hYWktaWRwLnV6aC5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL1HvFAYnMgYMNKotB3ZroxXp+UjHokAPoqO0RwUwSWU85xWUBh4
+1rvKkaLCTr2eOrPtWS90yabqJsitdmH92dzrgFbxdT7e/FdwyinwyfV2hcWHXHWO
+2OK9O/AurKe1S36ZS+kS78GQaIAKS5tp3dP1q8rYS7sTen/MquNRhy0E7uVcSABw
+BnADCpRJIN3edrv1Ka41I4W4FAsMSgr3dgmwQ4xrg2B/482VeW+tiq+NzmPRR/6u
+p2iQv2bjkyAmNPshTWeHYZpRAF3Zg/ZQjZhDVPRtjqiU+Wq5ntaRTCrkY4Y2COWQ
+rWN+Uh4OFSWrKpFc1aOPOI6vyWcS4Z4iGfUCAwEAAaOCAyYwggMiMHcGCCsGAQUF
+BwEBBGswaTA4BggrBgEFBQcwAoYsaHR0cDovL3RydXN0LnF1b3ZhZGlzZ2xvYmFs
+LmNvbS9xdmV2c3NsMS5jcnQwLQYIKwYBBQUHMAGGIWh0dHA6Ly9ldi5vY3NwLnF1
+b3ZhZGlzZ2xvYmFsLmNvbTAdBgNVHQ4EFgQUJ3XcV+xSN7MDp0eLpo8VIn7IZRsw
+DAYDVR0TAQH/BAIwADAfBgNVHSMEGDAWgBRVWIbOunx2TpkTqQ/TbJ/C9dM84zBR
+BgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBAjA2MDQGCCsGAQUFBwIBFihodHRwOi8v
+d3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MDsGA1UdHwQ0MDIwMKAu
+oCyGKmh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2ZXZzc2wxLmNybDAO
+BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBkG
+A1UdEQQSMBCCDmFhaS1pZHAudXpoLmNoMIIBfQYKKwYBBAHWeQIEAgSCAW0EggFp
+AWcAdgBo9pj4H2SCvjqM7rkoHUz8cVFdZ5PURNEKZ6y7T0/7xAAAAVJZSsXGAAAE
+AwBHMEUCIQC0BJ59f/nVOrCAzSsNPbSnMODLYcao2T4a0js7HZhm9wIgUhJQDGXA
+EJ/MtqIe5j5jtuPYiotktVPMIlWUkOHT5KgAdQCkuQmQtBhYFIe7E6LMZ3AKPDWY
+BPkb37jjd80OyA3cEAAAAVJZSsiyAAAEAwBGMEQCICC/hLFK7J0asHg3xCB/UGWb
+eRVtl2PdOI1EyHK4j0XBAiA8DkiN1e3SK80mlJmeQmuN0CoN5tEMHBMZD2W3bFWN
+sgB2AFYUBpov18Ls0/XhvUSyPsdGdrm8mRFcwO+UmFXWidDdAAABUllKzGsAAAQD
+AEcwRQIgZyl/dNpQIyBBjT/Wq79EW45S5p+dy3PlwNsEo6vk4sICIQDmidXo2tDF
+jZbVi2g++aryPHRYCyw1/sxjUV3KZxAEoDANBgkqhkiG9w0BAQsFAAOCAQEACIqJ
+nxowoGjhWw5aO154e5uJm/8Bh/xn/8+Vnp5PdSQaYAgs92lPxUNTv1ZHK0fsFW2I
+rv3AJJKBeCIICB44zCSKlkMoLPtBpm05K++EptLjnvc4/lan8DjNy0phMNnhht3c
+9fi1KIEaOg394JTfIhkcukFKBReelrBUJgG+XkMsgfGdpOw7ULnSKUvcmgA2ypRL
+EncpfLGhDOKtalVy9oLF6cC9/dvnhAOPiAcBJMlkVYmXqmUmhProoyFzDq0pbLcg
+xGfdQXcGLCKIAlksfJ5v5r3Dnji7Wj5nAHRfigBxDv87F0ZKesV08pQlef1NcVM+
+M5r00gwrZAVynl2Imw==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-idp.uzh.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:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">uzh.ch</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="de">Universität Zürich</md:OrganizationDisplayName>
diff --git a/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml
deleted file mode 100644
index 90159289..00000000
--- a/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-integration.dfn.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-09T13:52:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <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 AAI Integration + Test IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DFN AAI Integration + Test IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="de">AAI Integration and Test IdP operated by DFN-AAI</mdui:Description>
-        <mdui:Description xml:lang="en">AAI Integration and Test IdP operated by DFN-AAI</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:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai-integration.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai-integration.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHF2OL1edpCjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
-NDU3MDlaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
-BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
-bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwFs5WqdeU
-cYUa1Q1E+XzX41AljqcXIrkD0DNQ/80AvGDYZ5IKXs5SwlimXhkaNSW/tvqHAlMJ
-F2aZd0q2jjZBSaKd+DPOfP+tX2jg+2FMz+wGSnvP8BOnru44GRMlZr2nbJSxy6Pp
-gAliaX4xT03xJMqAT5KcdVyG6ZnOofBXDw3DJZTmHrZWw+mnxzvW1+O/ySO+E5q7
-iro+Zn40OZfQZaIDbH5qciE3XwrfMr8tZ2XJC62faGW7ZIr1vNGhAQZj3OBLYDtf
-KJP37LxBuy0zYjOMIWUudfRz9oe8GYTs4sOFpovtX+cO8hZzQtom24fph7+hJPc+
-GQArFjPwoa2QkuQQKXoZRJE3IGSRKutNkpZH4s0kwDfly1qPoMqv8EsjwGQgFe+e
-gmzEyyc4tB4AjldCxObvUjKDcUHsmoc2st2bm0+VUxmwoio4hGi0w4rW/FC9M7UH
-2hKEF9paUMeePRfxDLOG3na4ccK65RcSlYpTHizC8HU3AuQ0AzYB/Tes9Oczder/
-ah/U+b/IeJ7ADm/v1m/2p5GMlrAo78XZt6HhLmm4DKKzdiW6uxAHXv30B0houGgn
-E353AyUzBfERLXEkH3FUFYmOySRGStiUBQ1X4zYOQcvkaYruN4PPvOrHW/8H04lu
-Qfp9kynkF3ivk2RBtJFn6k8Z9g1B4kMOwwIDAQABo4ICTzCCAkswOQYDVR0gBDIw
-MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
-AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFCVvQOYyQfLPymaCGHMtdPpSAi9aMB8GA1UdIwQY
-MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
-dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
-oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
-Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
-aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
-L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAZS3H79/HypaZdIGGU640RM1XrWC+A6iaeiJM
-cCIh7rzi++k3bbJWqZqRIxahtOJ0eyFryzc3CO1fhxIK1hRadvp/ZRxhzMH8Gzxo
-FZDU0uD4dzEHyAlo7Rl6Fvn6Zavl+6zbqr9ZNNJDnzPBD89YNCzMR1tGlhctAqE3
-MGTrIX43sYg3o/dEtE3cGV0H37Ea+vnboIvs4NWnFp9VP/iZfCft+anBrMU9VWjv
-sdBn7ycJhT+qKS+RCATDfldXmV3YUH5h5AegQBJhqoODwAR8pjVEl5p8JYMt2Gay
-fpkR3SKNxMqfBlCFiPbXwVv6m+f8qXHVN6Wp1YCP+XaP5IigLw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-integration.dfn.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.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">dfn.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai-integration.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai-integration.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHF2OL1edpCjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
-NDU3MDlaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
-BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
-bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwFs5WqdeU
-cYUa1Q1E+XzX41AljqcXIrkD0DNQ/80AvGDYZ5IKXs5SwlimXhkaNSW/tvqHAlMJ
-F2aZd0q2jjZBSaKd+DPOfP+tX2jg+2FMz+wGSnvP8BOnru44GRMlZr2nbJSxy6Pp
-gAliaX4xT03xJMqAT5KcdVyG6ZnOofBXDw3DJZTmHrZWw+mnxzvW1+O/ySO+E5q7
-iro+Zn40OZfQZaIDbH5qciE3XwrfMr8tZ2XJC62faGW7ZIr1vNGhAQZj3OBLYDtf
-KJP37LxBuy0zYjOMIWUudfRz9oe8GYTs4sOFpovtX+cO8hZzQtom24fph7+hJPc+
-GQArFjPwoa2QkuQQKXoZRJE3IGSRKutNkpZH4s0kwDfly1qPoMqv8EsjwGQgFe+e
-gmzEyyc4tB4AjldCxObvUjKDcUHsmoc2st2bm0+VUxmwoio4hGi0w4rW/FC9M7UH
-2hKEF9paUMeePRfxDLOG3na4ccK65RcSlYpTHizC8HU3AuQ0AzYB/Tes9Oczder/
-ah/U+b/IeJ7ADm/v1m/2p5GMlrAo78XZt6HhLmm4DKKzdiW6uxAHXv30B0houGgn
-E353AyUzBfERLXEkH3FUFYmOySRGStiUBQ1X4zYOQcvkaYruN4PPvOrHW/8H04lu
-Qfp9kynkF3ivk2RBtJFn6k8Z9g1B4kMOwwIDAQABo4ICTzCCAkswOQYDVR0gBDIw
-MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
-AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFCVvQOYyQfLPymaCGHMtdPpSAi9aMB8GA1UdIwQY
-MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
-dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
-oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
-Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
-aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
-L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAZS3H79/HypaZdIGGU640RM1XrWC+A6iaeiJM
-cCIh7rzi++k3bbJWqZqRIxahtOJ0eyFryzc3CO1fhxIK1hRadvp/ZRxhzMH8Gzxo
-FZDU0uD4dzEHyAlo7Rl6Fvn6Zavl+6zbqr9ZNNJDnzPBD89YNCzMR1tGlhctAqE3
-MGTrIX43sYg3o/dEtE3cGV0H37Ea+vnboIvs4NWnFp9VP/iZfCft+anBrMU9VWjv
-sdBn7ycJhT+qKS+RCATDfldXmV3YUH5h5AegQBJhqoODwAR8pjVEl5p8JYMt2Gay
-fpkR3SKNxMqfBlCFiPbXwVv6m+f8qXHVN6Wp1YCP+XaP5IigLw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.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="technical">
-    <md:GivenName>Wolfgang</md:GivenName>
-    <md:SurName>Pempe</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/aai-login.ehb-schweiz.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-login.ehb-schweiz.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..945c5ac2
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-login.ehb-schweiz.ch-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://aai-login.ehb-schweiz.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-04T08:50:31Z">
+      <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.ehb-schweiz.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">ehb-schweiz.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">EHB / IFFP / IUFFP - Das eidgenössische Hochschulinstitut für Berufsbildung</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SFIVET - Swiss Federal Institute for Vocational Education and Training</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">EHB / IFFP / IUFFP - Institut fédéral des hautes études en formation professionnelle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">EHB / IFFP / IUFFP - Istituto Universitario Federale per la Formazione Professionale</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Das eidgenössische Hochschulinstitut für Berufsbildung</mdui:Description>
+        <mdui:Description xml:lang="en">Swiss Federal Institute for Vocational Education and Training</mdui:Description>
+        <mdui:Description xml:lang="fr">Institut fédéral des hautes études en formation professionnelle</mdui:Description>
+        <mdui:Description xml:lang="it">Istituto Universitario Federale per la Formazione Professionale</mdui:Description>
+        <mdui:Keywords xml:lang="en">EHB IFFP IUFFP SFIVET Zollikofen Lausanne Losanna Lugano</mdui:Keywords>
+        <mdui:Keywords xml:lang="de">EHB IFFP IUFFP SFIVET Zollikofen Lausanne Losanna Lugano</mdui:Keywords>
+        <mdui:Keywords xml:lang="fr">EHB IFFP IUFFP SFIVET Zollikofen Lausanne Losanna Lugano</mdui:Keywords>
+        <mdui:Keywords xml:lang="it">EHB IFFP IUFFP SFIVET Zollikofen Lausanne Losanna Lugano</mdui:Keywords>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gIZDQgoRoUtKwAAAs1JREFUOMulwUtrnFUcwOHfOXPe6zQzkxknrcGqC6mgFo0FjXcXpiDS4qUoIi4kLgUXbnRRXPsJCi67krZKtBGLihTEhYK0qEgNaUs7JE2TTiaZvDPzXs45fz9En0e9vXhdXns65vEjM1xaG/L+sTq//p7RH4RsXFeIH7BbGD76YIZGK8epBOMKnIrwePS+dsr8QoNDTypW/qk4d3qPC99MyAtF92DF4SMd8lGA0qBUwmQyRlRITQN6Bz3YKNnaquFFgdUUBTivCCPPOIO13jZxXLKTFVjnSRMBUXjn0bTRB2dDstEeayue+w5EvLtY5+ibHcY7Hl9YHj7cQTlwAugSkTpSE7wXrPPwx18T+fLUqtxYcXJ7WElVjuXva6X0rZWLv/XlxLGbsvzDHRl7L+eXMrl61cl6f0/OL41lczgS5UWksJ4IhVNgtOO7nwuSIKSeKGxQMPdYytLZnNGwZOHVlOVvR8SRZrtfoJUDoxVKV5iaRSrN9qBi/faES39mrN/MsbnlypUhJrSowNE4ILz1Ycqocmj0GK8EcOADCEoIBB2B1Q7nLL4wRIlFTIS1Ab0bjpOfbHLoiQiDTVHBBJTgAOVimqln3FfMPQrPPt/GoGi0QhbfS9C1Gvu7hs8+bqMDjRKfy9otoeYrfC1k9l7Nv71dpusp3qZ8f2aD+VfazO43nP1qi7n5Bs004ZefBrx8tI6xRFy4uEueaVpdx4nXQy5fnhAZjVOWzj0tptqar3+cEKspZmY8Z5bv8OD9wrnTGdqoCUkiRPWKIARdCc2wS5kF9K6B1TvEpqS3uok1I8ZFTLMZ8cwLTWzg0eITFApFzGivwlFR5JZ8FLGvIXQ7LUIVMhXOMN1UJFHF4FbJqc+HPPVcgHGqQlTAQ4+UDLYivjiZYaZjFt7IWf3P8OJL4I0hSHc5frxDEDmSNOadT+GB2TpKRIS7oLlL/wNnjGEYoDkDfAAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="29" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAAdCAIAAACytXxIAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH3gIZDCsw6oKoKwAAEjBJREFUWMOVmGmwXVd15/9r7b3PcO899777Rr33JPk9WUaSZQRtYuhgN7FNHCCBUEk5ocHQDAnGJjEkzmAa2tAph8SEVCATU8AY40AluKiQcojdHZopJqEtJgeMjCVkyXp68313PsMeVn94dHV1VZSKdp1Pe39Y9dv/tc5e/0VHX/GBej72SW17Z3T5svrMh29zA/eqt37q/ve/oVm3rJQDvfyNn3jPr7/w6OXtd/zZIx+65yuXXd7s7OxMJUsf+eAvHp3VyjXBAONfXYJA4BDABFAQEZAajFxv3DesmAkiSinrXAgSpQl8KMsyiiLvfQghiiJrLTMzBRFRoOBEGVNaT6yFlZIKF7P0D5/8wZc/eeuhffsH/dzLMIX+3tr6yY21It+eaDYQ9Nj5s2sbvbGr0PjGd1dufPl/+sjbXzRS7qY3fOjnXv1Hpz7/u1BhRL4OcwFgIYAZwQkpISIBajUd60kIiAQSlFIgMKOzM4ojPT1TDwHWhjjmwaBoZjVjqBAfKSXBe++9t40sIa2c9wiNiwNu1OtLC/PNetRME1AbATqqI9bQCjAAKeh2PU1gY4SG6D17GcYpqNfe9J/f/I53QwBLtUhdKICIgOBc0IpB5JxTOnrssRNWp81GrSiKODIiUpRVCGEwymupqtfrzJwkSa/XazQaPBqtr6/XTEsplcbqwNJMpCMQvJdEaShcHLBic89fPza7r3bu/Op/PHbw+qsWszRw5d//wD/vm53Q3nQHq2tFyU1tMdJ1OXe2t9Ib9kbD+/7uH970ppfBWAQzBGUXCMDEALRm8QCL1tp5aK2L3Kq60b6SUqy1sTbDsoigm3EDDsxc9gvlWHtFgVCKVblJkkDYvT6joVUQBEJ0ccDe+y988ThSdW5lJ9Nz111Vr5nI9kcP/e2JS/ZMlIORlU5n09SSKUbSnpi+9/7/cer01ub61toPz/3Wm2608EZM5gB9wRjei1JEDAG890rxoUMHe8VYsypGoTWRhRCKvFrOFsZFrgKiKKqqKsvS8bjq9Xq1Wu3K+aPd0UCrqBjnpUVvp5fGOmvUlNKQi1SYiD7+wV/aM9EQgBCCd51ud2Jq8u/vfV2rYQzXcycvet2fDjtr2HvJ5trmbW99+XvffL0l/4nPfPVVb3nPyYfvdFSSUurCxEqRCAggIqWUD3j88SdWdkomzM7OnltbFZH1re0syybak8U4H4/HeZ4vLy9vbm4WRSEi7XY7S8WYeDzK19e64u3ePXsmMgV/wZ/lBYGLPKfglAR4BrEidl6XCDY3ppkCCIr6uS2EHevc2Lg2AjmCfukN1971J1944sTpo5cfRgj/RuBdhREAAgBmHD16aM9O11tXq6fi/MREM68Wujs9ZdSeg3uHw6LT6TQaOLDnEmttVVVxHKtEBzBAVekUiVYQDoQgcnFFrOem59525z233Hbj+XMb02njBc8/YKKwurEZgBACM/vCVn0fRiaC9j3/6FfOfPfqTlm433n/59pJfOTIYTiUmuMLx/iRwgQRISIATzxxauyimanpr3/lGy/6qWs2u+7R4986dOhIvzM48eS55eXltU7elmRwfqUoimazOTvbWH/iXJqmrKOVlZU40bPTE8v75kIIzHRRwOqLDz1w39888lf/8+kv/dPj506f+JmXXOvj2pmzKz973bEkiTxgyJ85u33N1cuT7Ua1NX7waz945PvnH/rK11nrj73nzTPNstSRCbAU2JZQ2sIxgoMIcnYRCXkH0ZahKDjPsD6Qi+MsGoy6Xuy+S+bzsursbDabjayeBqeKfDAx0Wi1mt1OD8IED5Taa2MiF1D6youvN6LJZkrkAAbk3/+RuOAUVQADkQcDUKVDqaUOcaAYGPapkcESyAIMHQJcGImu1wIQ4DVU5VaF6r6qhUQnOZQqinhsfWo4pGVdEpAT0UTOwSqYKtf9fCAiWZaVVeGsByDe19JGYNUfdJqtepFXEBNFUWUL58okjsejXCf1Wi1xFvloZAiKWChclMLkilzFCt5CRYB2FpoFVIFjCLwFKfvLb//wW15z3bOvOFoAt73jgX/+9ndqWZtUft/dv3TpvsZ9j5x/z90fr+l2d71z62te9OZbr7v7Iw999BNfnV+Y6I/p6DLf/7u3Zy048QTlSGKiqhTvHShEke73+7VazajIOWetFxalScRrHdlKdjstpSgo8d6LUHBSlTYxCcAhXBwtAI04ci5oVROghCPDBFY2doxAUBHGhfmnb3Zv+nntgDv++2cefPj4lx96l93qlc48Y3HSB77zrR94400/+cuvf+6Tp90l7UYCHP/ayeuf88y/+ONfPLty9sab73nDb9z76Q+/WivtKcTCzqM7HIzGLo6NNpWiqDvM8/FOlrXK0vpQTE9Pb6yv19K6UnG334tM4nxVBR8bpRXarbqqR0AICCKi6CLfYRUYigFHQLLbGEFgBCgZTCBWpjk9k8SpDzh1bv321//cclvzxLzVAPLvfGNt7+Klt97yM7OJn/4POpbKQWptdfDSuRpweO/8e+9+za/89mdKsTpoT30lTVI4e3718TO9Zlbfv28+TSNbetb1Uz9c7feHl+6ZbU/y5pb3fmc8HsdxOh4VWZZ1+wOtJFbyrGOHmxmHwGAwAXAXqXBAIJDSAuEAAoFh4ZUoBGFECcO7HSOIBVNT8eeP/+/lLzS2VkbpdHjty368Nd/o+/L+v/zHqcbU+Z2nX/FTV+5fmrGlrSUxCJCYChPrqAyuTohUDM+Vt4cOHTpywDOJs+NGYkhHIHVgYt5EiY2qcT449uy9oyK3rmw0GuNRIcJJssdo7nQ6iMZFUMHZNI4BAZKL7LR0aQMxIgYRWxHnhJgiFg0CPCrnVZyAAgRRrfnoY6c+kX5pZSVfOlh/7Ut+fDZLevnoUw8/kk20zp1++vCB+cVLZ5JUnXr6zOrgyLgn//XOT77giqVGnCFYVBEMIjJPnjj5+NnOvsV5lmrpkr2M8P0nTrBJGlm7adDrDofDc0QyvzATQ505udZqzqyWPR/C1lYHoDRNsjQ5uLS3kf5bHd6/DsxQCTMABABGgokUxMMrSPDaFKSjSuI8DEW79Y694+YX33nzNbB6HAHAEyujxcmZf7jvplraUgJyCJD29J6/uO/r/3JysLm5fsWz93z4rleUgDARqZxcAj0/N0Om2cxSCmUUylazceninIdmE0Xs52aXNta30zTRJhhjFxem6vWsP9Z5UXI8E0VRPY2CG6uogFK4SPegvVdQRAALiOEUFEERVABIoaprBvtRTBl5DdeztF+gSSENqNiRWNal+Jr2gApgH2DWnu7/xq88/92/+hKdRz4t4SICAAcDhqOgmaKpprLW7ts7vXp+e220Xas1XUBVVZUmO+zBBBgKEm1v52U1mpltFx5bWztZliVJNB6Po0h3BhWxjPJxFEUiAmA0LgAopeJaWtf1WKvKFv3uztLSIsGLeCbSWjkfDAmIA+AUWIGB0nFEIDK2cqqzORxVY8cYbJfDnR5RLpxaCjpAisHKuVUOUqkK0BEbAHlv4HrzQMypYxAIKoBCAgUiL4InT53dHOdxpJPJds7RuBh/98yTzKx0RBXG+eDA8iWKVK837HY7/cHO9MzeMteDXlhfXdXaJEmSJDEzx4nZWhvHqRCRiPT7w7ws6vV6o4GsPmLm0WjgbLm4dyHWCsQAaYhVMBAAAUQKHsELM4EYAcQk5Uuvv2puOiPCc48uLh+cA0hQArEwt5tTL772eZFEkaAiB2IJo2t+7JJL989HHiANLuCMMgwCfGl0TIzLn3mAXJEkCaGcnUvHY1ma2V+rZ8ycB8qLIoqV0abRCvv21dP0Mh+qyRk9M3eZ91IUJTNHkbHWWlfOTLV3FVZKKTXlgjcmrqrKlgxgbnY6BCeBqkoAhOBIpBAfEwdPPLbIjIVXY8W1AMBCDLjsU9wIjkRDISD4IBHncA0owNnSIBbxEgk77Ri66zApAkN5JQzEhgAE8Z5V5Wxdm1CGylrjnPPOKqWMMc45EHvvKcTErrIjIERRAk9EVBQ5aUVETIqZQwghBKUZgPIGTCG4EILWOoSglLLWsmHnnFJKM5dlSUTM7Jyj3V3AfvKBb584c/5db/3p7bXhO/78wT++48asmQYPpvI3f++TN7/yumccvFQIt9/16Ye/dDJuJFOJ/pM/f9WR6fih7/d/587POVY72+ff+Asv/9Vbrrr3s1//0Ef/Lq1PdkO4drn97t9//YTpkJvUFEhBkFdlPbc+eJskSTEeKqXqWdrvFyCVJYY4aB0AASg4YqV2h2FE9P+7wRBCYNYhgP/vtnNu14Tu2mTnHTPvDiGcC1qzhlICBLjHfnD++ONPkTZVxZ//8uN3/XoehVQbjCv98D+efemLywOE//buz/3lXz/22Y+/rTveDBgcnJ4LwM03333j85/z6tde+cOnT1+xvD8CHvzsIwf2zN31ztdtdJ76tdvvv/23P/qx972SNUgYFsGk3/2XH5zpdBfmZiOjlFJVVbVarf5gNMwL6XWuvua50LzrOIMHK0CYdgeCDswAQQKImYm9BP4RbtgdrQBBQhUgio1W/++IWABoEkCgmBsTE1GjQRCIn1qYZybWYASlFTemdVwH8K0nV171lhue92OKccCB4fHN751rTs+9650vm0iS51y+AFEWaE3MHTs6+6ylCIuX/cEf3n7nHfc4G0UGgAcpAR8+ctm+ca+WpExQikIIOzu9hf0zrFV/1OLYewiYHUjFFGABL9ABgY12IBFhDSBUrjI6BVA5a7QKEhTt8oni2Hu/m8nee6WUYgQJmilAGBDioCJS8AzvaKQDDABHBKvSXJNlj8kFc+7bpx/91oEzZ7faDfPi65+5kKXsys/+r+PN9kJ3bfWFVx7Zf2DS+YEzMwU4NirSayaI8pa0QfAg68DCerVvq61BLYmM0tZa691TnZV6PZudbJ98qjMejkSUrXwUa23k8KF9Kyu98+fP12qNLMu63W5VVWkaR1FUi0dE1O/3Dx8+YJidh1JQpCVAsQIQApRSAAhgYu3BzCBJgBD7QKKLRMXeFFGFAC9E2ljy7GNRth1P3PfVRzverWyNjy0kN7zwWa3J1s6IPnDf15JGY/2pjdYdM/uXG2lc29rsJ6DtvPzN3//7Y5dPJFENcKK0wMcwa531vBhVQ5NoU7h+v1dqrjez1tbWJuxg//6ls6Vd39hqtVqVK4MEH9BsNHbSNEDyyntlEHHpUPlqnNs40mXllAIAteuOCUQ/qvLdhA8hEBERaYIFFMi7YIVYPFxhOVDdNzw5RaRKl7jJoc0ZtL4+eNutL73jlhfspieCP/30xsI0HvrYbc0sDRhFiAViplp/9qkvfuf4xup45/Di1Pv+6BYQIBoEFvaCLMuMTvccbW5u7WS1xdplyjo/Grsjlx0e9gZwxdLi1IF9c8xMJMV4ZIfDREVHnjE1HOdGtQSttOaZMeg4Z7R412zs2en2FImIN8ZorZmSoiicc1mW5Xleq9Wstc45zYDAA6Sj2HpPCvWE3Kizs13UpmKv1Xbf5utnZ9I2RI9IGRop5CAD1gHiFYlilUQKVqMOH4iQr/V/7TXXv++3fnZtq9ucmUjhIFoYEkAQxf5739k6vfHk7Mzi9vrOC3/yqoEbP3Wqs7MzvvonDj9+sivEqxvrURRprb33tTjxtqqcn1+c2NjaykcbGxtrN9zw3EatfvybJ1Cr93o7ray+Z3Zuc3NzPB632hOKTVXY7e3tOI7jOA4hzM3NbW5uMrNGMERw1hdVGOdDwO1fbDUz/8o7Pv3VB26JVPiFWz6oGubQM2dK5P0q74whlCKI90GM5K4oBjm6jqZiYZCCiPSLYm/aEinnZiZIAryGDh6sGICDmGPPax2zL9jeHNaPLMy1udMJc20cObSAcvSsKxa990v7Up1orTUcvPVFUdRqDevdwkxLa93vTk/EPFFX1159iHS8sbFRS+JWq9WdVGVha1mzrCrFAZgiohCC9945O9Nsaa1/5DW0UY1GY2lpCd4HFe699+7/cvN7D1z3dka2f7Lx4MfeGQV4iq+cSqanp4NAESlNFWyapnv37q3VYhBEEIJXSs3MzMzOzhKzD1AXmLGVZbmw0C6Kcqe7E8eNyclJEe+9K4tRmqb1eh0a1loExHGcpqm1vlnPqsoy8+TkpCLp94egYAs7Pz9ny2owGNTr9WZmnMBEEcQC2C1gEdmtYa31/wEu09ISiEvnQwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.ehb-schweiz.ch</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">http://www.ehb-schweiz.ch</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fr">http://www.ehb-schweiz.ch</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.ehb-schweiz.ch</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>ehb-schweiz.ch</mdui:DomainHint>
+        <mdui:DomainHint>iffp-suisse.ch</mdui:DomainHint>
+        <mdui:DomainHint>iuffp-svizzera.ch</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>
+MIIDQDCCAiigAwIBAgIJAJ3M6RXWA//7MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGGFhaS1sb2dpbi5laGItc2Nod2Vpei5jaDAeFw0xNDAyMTkwODU4NDNaFw0x
+NzAyMTgwODU4NDNaMCMxITAfBgNVBAMTGGFhaS1sb2dpbi5laGItc2Nod2Vpei5j
+aDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAN2avTSONQyVmUrout
+iUiLIOr76jMCW6TZ48uvUHt0D+GxPmbkE5lMxVpmTvBxsMd687o6IqFsqMw3pSzt
+hyJ/Zl+T7HCANhPKKUQTNd1X/OX6L1QAi6r88dgcZtlM7RYRwoj8fJ+EFk6WhJuJ
+74UcJHKYx0U9dYY2B25ld+GM1Ah0NikNf2pE+Hw2J0l+O37QpG7aI6GzqYYCkD3V
+qI5BvMkK5EzFZI1FBNYcahBsHyIrP7c+GLTJsBEbBvzbxN/GX8zT7Em1KCpNllu4
+DEqk3f8ZjWJFFJlcgHVKF+DUxswr7PoU/QhH1yMcy4+CHP138kCoOJdhfAN7dEtf
+7M8CAwEAAaN3MHUwVAYDVR0RBE0wS4IYYWFpLWxvZ2luLmVoYi1zY2h3ZWl6LmNo
+hi9odHRwczovL2FhaS1sb2dpbi5laGItc2Nod2Vpei5jaC9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUhierWG+h39Wt/g62bByZw6xwTU4wDQYJKoZIhvcNAQEFBQAD
+ggEBAIJofpvKjzSqGnON+rSXn94cs4ubAkuOQEn/XjnoJByMAFXWGcoEK9O8bFfE
+RDAeY/JqRUf72oToSEnOW25EtHZI+76H6Vss0PQ2OG4xfndgjIJeWkkR1nnSVrnh
+YRbHTwUna9v06DXYR4C6cwOEc/AyWLL7cdHb0cnydLAaNxgF7JYrPvMtGxCgoQtm
+rzLxebDkJ/9NyB0ChJh1MiYoHgo4DqnMGNAFg8wKEoRjbTAvR+/urdtomR+DEhXF
+6q5pVoS+6mcH5JbAAaMlP3IMdqMtlXQLZfrrIki4oK1oKmG47Im25K9sucNtCmmk
+SMtMXUOPoo2ywvrbXUtGDDHFJYE=
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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.ehb-schweiz.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.ehb-schweiz.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.ehb-schweiz.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">ehb-schweiz.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDQDCCAiigAwIBAgIJAJ3M6RXWA//7MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGGFhaS1sb2dpbi5laGItc2Nod2Vpei5jaDAeFw0xNDAyMTkwODU4NDNaFw0x
+NzAyMTgwODU4NDNaMCMxITAfBgNVBAMTGGFhaS1sb2dpbi5laGItc2Nod2Vpei5j
+aDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAN2avTSONQyVmUrout
+iUiLIOr76jMCW6TZ48uvUHt0D+GxPmbkE5lMxVpmTvBxsMd687o6IqFsqMw3pSzt
+hyJ/Zl+T7HCANhPKKUQTNd1X/OX6L1QAi6r88dgcZtlM7RYRwoj8fJ+EFk6WhJuJ
+74UcJHKYx0U9dYY2B25ld+GM1Ah0NikNf2pE+Hw2J0l+O37QpG7aI6GzqYYCkD3V
+qI5BvMkK5EzFZI1FBNYcahBsHyIrP7c+GLTJsBEbBvzbxN/GX8zT7Em1KCpNllu4
+DEqk3f8ZjWJFFJlcgHVKF+DUxswr7PoU/QhH1yMcy4+CHP138kCoOJdhfAN7dEtf
+7M8CAwEAAaN3MHUwVAYDVR0RBE0wS4IYYWFpLWxvZ2luLmVoYi1zY2h3ZWl6LmNo
+hi9odHRwczovL2FhaS1sb2dpbi5laGItc2Nod2Vpei5jaC9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUhierWG+h39Wt/g62bByZw6xwTU4wDQYJKoZIhvcNAQEFBQAD
+ggEBAIJofpvKjzSqGnON+rSXn94cs4ubAkuOQEn/XjnoJByMAFXWGcoEK9O8bFfE
+RDAeY/JqRUf72oToSEnOW25EtHZI+76H6Vss0PQ2OG4xfndgjIJeWkkR1nnSVrnh
+YRbHTwUna9v06DXYR4C6cwOEc/AyWLL7cdHb0cnydLAaNxgF7JYrPvMtGxCgoQtm
+rzLxebDkJ/9NyB0ChJh1MiYoHgo4DqnMGNAFg8wKEoRjbTAvR+/urdtomR+DEhXF
+6q5pVoS+6mcH5JbAAaMlP3IMdqMtlXQLZfrrIki4oK1oKmG47Im25K9sucNtCmmk
+SMtMXUOPoo2ywvrbXUtGDDHFJYE=
+						</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.ehb-schweiz.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.ehb-schweiz.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">ehb-schweiz.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">EHB / IFFP / IUFFP - Das eidgenössische Hochschulinstitut für Berufsbildung</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">SFIVET - Swiss Federal Institute for Vocational Education and Training</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">EHB / IFFP / IUFFP - Institut fédéral des hautes études en formation professionnelle</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">EHB / IFFP / IUFFP - Istituto Universitario Federale per la Formazione Professionale</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.ehb-schweiz.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.ehb-schweiz.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.ehb-schweiz.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.ehb-schweiz.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>AAI</md:GivenName>
+    <md:SurName>EHB</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@ehb-schweiz.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 31 910 38 38</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/aai-logon-qm.its.unibas.ch-idp-shibboleth.new.xml b/swamid-interfederations-2.0/aai-logon-qm.its.unibas.ch-idp-shibboleth.new.xml
new file mode 100644
index 00000000..47958e4b
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon-qm.its.unibas.ch-idp-shibboleth.new.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://aai-logon-qm.its.unibas.ch/idp/shibboleth.new">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-11T11:48:21Z">
+      <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>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn: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: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="en">New Uni Basel Test IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Uni Basel Test IdP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unibas.ch/de/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDVDCCAjygAwIBAgIVAKMVlGIsXbXX6z/I2qFfxt6K2G3kMA0GCSqGSIb3DQEB
+CwUAMCUxIzAhBgNVBAMMGmFhaS1sb2dvbi1xbS5pdHMudW5pYmFzLmNoMB4XDTE2
+MDEwODA5MDkwNloXDTE5MDEwODA5MDkwNlowJTEjMCEGA1UEAwwaYWFpLWxvZ29u
+LXFtLml0cy51bmliYXMuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCjkH9DBmxGnJascUF6vkqYVzcn0v9ghkMVG+kRp5IQ9le04xVX5DoF1hFrSltj
+FVillz+7t4Uu3X6ciTFaqPBsbLVrqUuMh8a+Xgc3nYESlnp+vvO7m2sQI5tye29H
+fzx+kGZ0xQg65wc/onAAJl08DSD4kbHq3DQ4Vh1pCujRTXZio5JyDy8bMAzY1rr6
+KSFUSgnIqGBnSNyCsUNCYg2z5USxYp4dApWyGM3o57XGPTgzKLJWzjgp2V0hEInh
+hq01hazS1MXPYKnjB4BE+RvrPwJomEsXc0IAHhrzrHUc49HCNgGQIkOin2NTBS3j
+Dvql2MPQGM+yZYNzo6pG0nX5AgMBAAGjezB5MB0GA1UdDgQWBBTJItTcSDnPKqFE
+qBsxdXzQzzro1TBYBgNVHREEUTBPghphYWktbG9nb24tcW0uaXRzLnVuaWJhcy5j
+aIYxaHR0cHM6Ly9hYWktbG9nb24tcW0uaXRzLnVuaWJhcy5jaC9pZHAvc2hpYmJv
+bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAArwIaf+veOMBYFQV1X8ulhK4lnZqEd4u
+CW68H3EQIJf8SCUzSQd5YSGxAUO2m7CfLYYfD72SMoZwzlJxwhUDYh4DA/wEh+y5
+xlY7dGicQItvQo8j9opYfYhfCfR1B9PcJmLk73/2YrhSg/EcEpnO7mshK6DF7ra5
+MOGRssldMlB1Mgo3zAzv6tU1PUttdELwXIMadrRKpNK8jni5kCYMhuz2XXYgxbU1
+DPsuN02KeGlGK38oh3Bddp8jYzwa7ntEk6UAzz76DuqitupvvZ4h+oC3bM9YWa5Y
+GRk9+65QCpWxAI40kQ5E0mDxrnfiHC2I8FJQXY4ZkqvSY7674l1mXg==
+						</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://aai-logon-qm.its.unibas.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon-qm.its.unibas.ch/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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>
+MIIDVDCCAjygAwIBAgIVAKMVlGIsXbXX6z/I2qFfxt6K2G3kMA0GCSqGSIb3DQEB
+CwUAMCUxIzAhBgNVBAMMGmFhaS1sb2dvbi1xbS5pdHMudW5pYmFzLmNoMB4XDTE2
+MDEwODA5MDkwNloXDTE5MDEwODA5MDkwNlowJTEjMCEGA1UEAwwaYWFpLWxvZ29u
+LXFtLml0cy51bmliYXMuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCjkH9DBmxGnJascUF6vkqYVzcn0v9ghkMVG+kRp5IQ9le04xVX5DoF1hFrSltj
+FVillz+7t4Uu3X6ciTFaqPBsbLVrqUuMh8a+Xgc3nYESlnp+vvO7m2sQI5tye29H
+fzx+kGZ0xQg65wc/onAAJl08DSD4kbHq3DQ4Vh1pCujRTXZio5JyDy8bMAzY1rr6
+KSFUSgnIqGBnSNyCsUNCYg2z5USxYp4dApWyGM3o57XGPTgzKLJWzjgp2V0hEInh
+hq01hazS1MXPYKnjB4BE+RvrPwJomEsXc0IAHhrzrHUc49HCNgGQIkOin2NTBS3j
+Dvql2MPQGM+yZYNzo6pG0nX5AgMBAAGjezB5MB0GA1UdDgQWBBTJItTcSDnPKqFE
+qBsxdXzQzzro1TBYBgNVHREEUTBPghphYWktbG9nb24tcW0uaXRzLnVuaWJhcy5j
+aIYxaHR0cHM6Ly9hYWktbG9nb24tcW0uaXRzLnVuaWJhcy5jaC9pZHAvc2hpYmJv
+bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAArwIaf+veOMBYFQV1X8ulhK4lnZqEd4u
+CW68H3EQIJf8SCUzSQd5YSGxAUO2m7CfLYYfD72SMoZwzlJxwhUDYh4DA/wEh+y5
+xlY7dGicQItvQo8j9opYfYhfCfR1B9PcJmLk73/2YrhSg/EcEpnO7mshK6DF7ra5
+MOGRssldMlB1Mgo3zAzv6tU1PUttdELwXIMadrRKpNK8jni5kCYMhuz2XXYgxbU1
+DPsuN02KeGlGK38oh3Bddp8jYzwa7ntEk6UAzz76DuqitupvvZ4h+oC3bM9YWa5Y
+GRk9+65QCpWxAI40kQ5E0mDxrnfiHC2I8FJQXY4ZkqvSY7674l1mXg==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon-qm.its.unibas.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:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">unibas.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">New Uni Basel Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unibas.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Hanspeter</md:GivenName>
+    <md:SurName>Spalinger</md:SurName>
+    <md:EmailAddress>mailto:wsym-its@unibas.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hanspeter</md:GivenName>
+    <md:SurName>Spalinger</md:SurName>
+    <md:EmailAddress>mailto:wsym-its@unibas.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
index e80aa0cb..d828c2d4 100644
--- a/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
 <?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="2015-10-07T19:42:37Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-04T14:13:02Z">
       <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">
diff --git a/swamid-interfederations-2.0/aai-logon.unibas.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.unibas.ch-idp-shibboleth.xml
index fc7c096c..8acf01ee 100644
--- a/swamid-interfederations-2.0/aai-logon.unibas.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-logon.unibas.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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="2016-02-25T12:44:50Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-03-22T14:49:55Z">
       <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">
@@ -131,8 +131,13 @@ rcVXBQVY2qXZn91QHZJqxRwfLJ/fo82KwH6SJLjL2jW80zNCkfHvl4ycorbM+Wf9
     <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:GivenName>Hanspeter</md:GivenName>
+    <md:SurName>Spalinger</md:SurName>
+    <md:EmailAddress>mailto:h.spalinger@unibas.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stefan</md:GivenName>
+    <md:SurName>Keller</md:SurName>
+    <md:EmailAddress>mailto:stefan.keller@unibas.ch</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
index 8916f5b0..73ba735d 100644
--- a/swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
 <?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="2016-02-25T09:13:07Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-03-29T10:01:04Z">
       <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">
diff --git a/swamid-interfederations-2.0/aai.arnes.si-test-edugain.xml b/swamid-interfederations-2.0/aai.arnes.si-test-edugain.xml
index 4ad43307..fad7eb18 100644
--- a/swamid-interfederations-2.0/aai.arnes.si-test-edugain.xml
+++ b/swamid-interfederations-2.0/aai.arnes.si-test-edugain.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:algsupport="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:disco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:req="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.arnes.si/test/edugain">
+<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"/>
diff --git a/swamid-interfederations-2.0/aai.idiap.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai.idiap.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..e44133c1
--- /dev/null
+++ b/swamid-interfederations-2.0/aai.idiap.ch-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://aai.idiap.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-05T14:46:58Z">
+      <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://secure.idiap.ch/intranet/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idiap.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Idiap Research Institute</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Idiap Research Institute - Martigny (VS) - Switzerland</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAXdJREFUeJzc0ssrRHEUB/BfeSSbq/kDZuEfsPEPYDbkUWYmz5ViLCRKppRHNlKjSGOh3GahvMqNWBjpl2yEuiOTMhc318xgHq7Hve6YuXO/xoJSSlKUxXdzTn3O6XQIAOYnIf8QmDsxxEqPgqqRKJpHL/AtQEmCK1pKg7SHkV++h4HxwPeA18Q0g3Mtx9Dp/nr6p8CTpnNOt4SKsRDYXUWmQoI/FlX+OWUwZ9EU3TxSRa/vURSCCfoBuFXSnE9Q+IXVS9wrOvda09Ng1KTBDa7LKJ2Ko3Y2AceMBsfkA2p7L9EzHQQJyKCtG0nUsCqaMo2G4TAmVyLv6wt3oDYvYGZ1mIZkmLqvkNd2Bqb+CMV2HqRxC8iZ0JDddYOsFgG59kNYOvzvwEEENHcmc1inDNIkgVT7Qcp2wFi2Mb8WBnH7IZqH4yioC6DQug/HwCFC1xp9A4xMFk8N0crKKOmXYOs7gctzDimk0k+P+Pef+OvACwAAAP//AwAp8AGWLhfGfAAAAABJRU5ErkJggg==</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+hkAAAlOSURBVHic7FkJUNNXGn8hBEE5lUOsBLkMEKCKcp+CgnLJGQ4JISEkIVwBsVYG3VFURsdx2NG2W2qtrVe1OlKPsuu2a7WtO626jueuruuybafandluu3amu6vut9/7k8QQQir2+M+b8c38gHd9+b3f+9573xcIAJCneHLwToB18E6AdfBOgHXwToB18E6AdfBOgHXwToB18E6AdfBOgHXwToB18E6AdfBOgHXwToB18E6AdfBOgHXwToB18E6AdfBOgHWM/GCg1NTIXzN0roCCwqW9fHMxlacC/sDCnIAdTAkocCBC0SSbXY5OLhP+MAcHB5t1gUDwWPMrZZUv6LXaTwryC9fY6n9cO+ONt+Znr5jGjiugAAeIJnEiuQTEZzcXtPcNNq7d9UFly9aXxTGLfI2DJkSYlqlTpwXMmPFM5DRvb29aF4lE5j4nJydfv+nTI/z9Z0Raws9v+mzav1Tdlvfc9t0HE3MKomjdzc3NydgfiXY4MpMmTSI+Pj6hPr6+Eh8fKxjbXF1dxThUSMc7OjpyQlrwEAQHh8RIpdFl0qjoKmvMni0pd3Z2mUvH2RXQWDxyVm65Unf8JsiPDINizx+hets5SNG98fyElTOW/IKiQX1zG5SUlPeY2mZLwvPKyyv/1KDWgFbXPAq6phaoVzb83RXHJW0e+rjsyG0Ib9m2nc6Li0+Q0DGKehV4e/tMoW0hIaGkQa29S9s1Wr1NqBt1UF1d+6/5cfH9dN9M4s2ZGyuW19Wf1ze3Qmtbh000t7SDqkEDCxZkX8cpkXYFDAoOzil+5xaID38OZMsfgHQPAWk5cIss7n5G+IQClpSWD3Yufw4qK2s4AdEbxQ0Nmu8MHV3QpG+9VK9Uv4yCvWiCUqV+sbpGvsmHKliyuZpoB8+QDH0cnZuUnCJpNyxHUZoAvYsTMCgomMjrlFuUSvVA/TjQ6vRH2ju6/ks3MjZ2fh+dN3NmAGnU6I5RHupG7XBFRVVXWblMaQncZGWdQtXZ1t75Zyrm/PnxZ+wK6I5HXdy+uYn0De0jXceukoadq8jc0sm0j/PfJzjCxSVlg/QhkFVWcwKmpWVoqQjoMdcipVF29yUvL2+DrFpxeEFmegcnYFKKBBcDjZpHAj5OwWNM6hTKVsoDN/Sm0RZBW/d0Tc0QHBK6xN78Wnl9BuWMm3Hfzh2IaxE5c39zMqUrdpHlB/aSZzOdxgzGseNe31YiWwuYnb2oi+46etuJ71v4stq615aj9xYVFfcaFz1GwMd9CJYWl+YaedylddxIgqLcx+MPzs7OcbbmmGyjd0ZSAeln278DhUatfGPSiWLgO7Lm19+S7rc+Iaq+LlLUJBU8my1wtJriHBAjCJAmC0T+oeY2EX3JjUJaC5hlFlD9vQJax4HjeaCfn58Aj1dUalpGIQpTao2k5NTSmmXydfRzZbKxArq7e9gU0FQqZCMC0mM8WkD0pLH7F55F0rpWC9M0oSQ8hZAwtJ1YNE20tLmYlK3qJ7krB8LlPQ1FG/ceMOz6cHj9ocsPNh28/HDtjrN/U61+cyAkQxHImXZ0+lkETE1Nn4N32XXaTu2OB9pP8UMEbLEUUOQ82TzAMzLZKb5QGZRT1VaSUrqqlEyP4NpND73J62alLIxR7Ts73HH6DmjfuwOtxz+DlkN/Ae3+G6B79RK0bL8AsjXv3vFIknuabP9UAnp5TZ0SGDiL4F16lS4O76kbuYvzenJyFhtyckdj4cIcA762v/rRPTBWpsmveeXkSe3g9f/0nPgr9B69DWv3XvlGu2GoPzRTNeruC5TOmaU5euUfzR9/DcknPoXAPTchZuAqRG07D2FbPwLJxnchcu1vIatzCCSFa7LGE3Aid2B1TS2XiRQWjr0DMRSZkpCQ5E3rNITB2DDKni3rOzA9PRMF7LyvRgE9PD3tC1hRJR0jYLpm5Tr96S+g4tSXkHjwNmS+eg1SX7oAGf0fQVHfB5Cs29duaWRJc/f6it9/A07HMMR54waQ7ZeBbD4HpPc0kFVHgTTvhiDDIcho3POpX3iu+X6yFhCJ60dCEf3F0NCwcd8iPKJE1dB4koq9ZEl+t7WALi4uU+bNj/Oii8JwCKKjY+baEwEfJCXlUVYmu03rc2OiSIOu5a2qZfIBrEa5ubkT9OpRoG0YSCMPTR3lgZ54zyyg7u2L/4469U8gu28C+eUlIBvPAul5B4jhTSBtR8CtYEOJJYHorHzFgmO3gBy/C2THdRTvApDVH4JH1xAEtR2E2Pb9kKR8YXhmdEE0HS90HHnRaRw4IuBIHCgWB4bhnXWfEsL47NSyWkVvzbK6X1gCF7sOxxxvN3Cx4v+k0qjRcSAKiJnNFHcPD4JXwQVqCwPwYZzXh8e+Bx+MR8A6bkQ/zvu6pdUACYlJL1FbM3KVpPXYtb3yne9fw/MVLJNVZqMnH8fNGQWMHc+g/Qc0IA8Lk+wwCxiyVLFf/Pp5IK9cBdKHv59/H4Pmw0CUA9+ShZ2dNCrkHhh8TUXOXIon8FwkW+62/tBdsuk9cOr9HQR3/wbmGQ4+nKfsvzg7U7WCEFdXTjwuHBpxrsKi4kFKvLSswpyJoLfUVFXXfklJ0eDWFuixRHG/wuxBb5oXn5Aood6GogGmb5yXY1YTgZtzzp4tmt1g9vIwLT3zEE5x5+72rCZXsvrMA9J1AsjMeYqysvJ6mrFgkD8KNOtBJ/g8IlK6BWdNtrwDBWTazCXCPM0mUtq9kyxesZUk1NQR3/CpZrcTGp8RmoQ7m0+lA3GfFioMi0t0CY6dgxmqu6WnCoQiyyqhuS5mC6mYwwbQukUOKvT19YucNSsoBZFqDX9/f+rJIss5nl5eLrQvQCxOxTzagea1poK2xJjTpmNql22NgAAxhhPEhyNvjO3CJREkqahNlZCjWOvhQKYaP8vdBszfolAejwQUjY2PzYUG1bZCZbuZyNjxQqHQZn0i36KYxtoKmGnfxGw9ssE9Im3t99Rq9Vcenl52HxHLwtT3gT9lmUgYY1l+VgH5/t/FuP/TICMeiI/bffqi42P0VMCJChgeEUny8gs/w8D+CxeXyXMmsibeF8A6eCfAOngnwDp4J8A6eCfAOngnwDp4J8A6eCfAOngnwDp4J8A6eCfAOngnwDp4J8A6eCfAOngnwDp4J8A6eCfAOngnwDp4J8A6eCfAOv4PAAD//wMAUfXU8t/idIQAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.idiap.ch</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>192.33.221.0/24</mdui:IPHint>
+        <mdui:IPHint>153.109.180.0/24</mdui:IPHint>
+        <mdui:IPHint>153.109.178.0/24</mdui:IPHint>
+        <mdui:DomainHint>idiap.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:46.109363,7.084763</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>
+MIIFCTCCA/GgAwIBAgIUc5oinJDKUbOZyjmC+P8O33keKA8wDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDQxMDE0MTMz
+NVoXDTE3MDQxMDE0MTMzM1owgZsxCzAJBgNVBAYTAkNIMQswCQYDVQQIEwJWUzER
+MA8GA1UEBxMITWFydGlnbnkxMzAxBgNVBAoTKkZvbmRhdGlvbiBkZSBsJ0luc3Rp
+dHV0IGRlIFJlY2hlcmNoZSBJZGlhcDEgMB4GA1UECxMXSWRpYXAgU2VjdXJlIE5l
+dHdvcmtpbmcxFTATBgNVBAMTDGFhaS5pZGlhcC5jaDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANrDP5a+dPKgp3eQ35GjWsBmp8GEm7Dq/8R1BUMji4CJ
+NALJJKo2jYj/rhiR3r0owYkZEe/vMVVMPWFYa1R6YhJwT2AyGpQ+dLL4TS0k8bEm
+GG8+VGIiXjHxJdzdVhTLSZFvn+RGZnO3eSHBK50XD+Y8DMrPqPYEGAY4vE4Aw/3Q
+r2W/00wwsxg/75MR8n2MJ7u0MOZpmLcNhBdVsHigkRYRIoU9mGC1d2earuLvETBY
+JWqKnT/QbFZpseflktV6rO7eTMmgym0h1qv3bUjSf/yigsI70o2AsBUHCCUYHNjZ
+yzoimYxSjkKCMHli7YjnbpI54GYMig+xtu2+YI4Nc6UCAwEAAaOCAZAwggGMMHMG
+CCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+bG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+YWwuY29tL3F2c3NsZzIuY3J0MBcGA1UdEQQQMA6CDGFhaS5pZGlhcC5jaDBRBgNV
+HSAESjBIMEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3
+LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MA4GA1UdDwEB/wQEAwIFoDAd
+BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsX
+pzD78N45JbG9jLm4UScwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92
+YWRpc2dsb2JhbC5jb20vcXZzc2xnMi5jcmwwHQYDVR0OBBYEFNFeZgAptLnjtlqP
+Arv1M7AbWdBNMA0GCSqGSIb3DQEBCwUAA4IBAQBcSnouvpUyX4OdmffI/76JrVCL
+sQ+GtbK8Ew8oq2kILCdbQVUbGLOIC9SJSqv01tjsMmqT73MbHMPqMWxsU4Kaa5LE
+uIN6wD2gZP8T9MoYoYx1PBha2Hk0wQUXdvZvj5J+BN1kqfyLxQsyZbv+ORI7hAuh
++rOQoJqa+v2eTRUY0NO2FkYkYt3qQi+kkOjRWGK1FWk/VbUVM2xdzrB7nAeNURmC
+U4/8U/++URgyToaQsgE1PA8yd4jv239bXkc8Oa9RKFq/fLs/zb2bCI5WkC1pcbfm
+SdrvK73avM51zKN5u+UXa+VGJdUmAw3BuGz4U6WP/RQPX6xtoGTNMBoB4HMU
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.idiap.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.idiap.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.idiap.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.idiap.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.idiap.ch/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.idiap.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">idiap.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFCTCCA/GgAwIBAgIUc5oinJDKUbOZyjmC+P8O33keKA8wDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDQxMDE0MTMz
+NVoXDTE3MDQxMDE0MTMzM1owgZsxCzAJBgNVBAYTAkNIMQswCQYDVQQIEwJWUzER
+MA8GA1UEBxMITWFydGlnbnkxMzAxBgNVBAoTKkZvbmRhdGlvbiBkZSBsJ0luc3Rp
+dHV0IGRlIFJlY2hlcmNoZSBJZGlhcDEgMB4GA1UECxMXSWRpYXAgU2VjdXJlIE5l
+dHdvcmtpbmcxFTATBgNVBAMTDGFhaS5pZGlhcC5jaDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANrDP5a+dPKgp3eQ35GjWsBmp8GEm7Dq/8R1BUMji4CJ
+NALJJKo2jYj/rhiR3r0owYkZEe/vMVVMPWFYa1R6YhJwT2AyGpQ+dLL4TS0k8bEm
+GG8+VGIiXjHxJdzdVhTLSZFvn+RGZnO3eSHBK50XD+Y8DMrPqPYEGAY4vE4Aw/3Q
+r2W/00wwsxg/75MR8n2MJ7u0MOZpmLcNhBdVsHigkRYRIoU9mGC1d2earuLvETBY
+JWqKnT/QbFZpseflktV6rO7eTMmgym0h1qv3bUjSf/yigsI70o2AsBUHCCUYHNjZ
+yzoimYxSjkKCMHli7YjnbpI54GYMig+xtu2+YI4Nc6UCAwEAAaOCAZAwggGMMHMG
+CCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+bG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+YWwuY29tL3F2c3NsZzIuY3J0MBcGA1UdEQQQMA6CDGFhaS5pZGlhcC5jaDBRBgNV
+HSAESjBIMEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3
+LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MA4GA1UdDwEB/wQEAwIFoDAd
+BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsX
+pzD78N45JbG9jLm4UScwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92
+YWRpc2dsb2JhbC5jb20vcXZzc2xnMi5jcmwwHQYDVR0OBBYEFNFeZgAptLnjtlqP
+Arv1M7AbWdBNMA0GCSqGSIb3DQEBCwUAA4IBAQBcSnouvpUyX4OdmffI/76JrVCL
+sQ+GtbK8Ew8oq2kILCdbQVUbGLOIC9SJSqv01tjsMmqT73MbHMPqMWxsU4Kaa5LE
+uIN6wD2gZP8T9MoYoYx1PBha2Hk0wQUXdvZvj5J+BN1kqfyLxQsyZbv+ORI7hAuh
++rOQoJqa+v2eTRUY0NO2FkYkYt3qQi+kkOjRWGK1FWk/VbUVM2xdzrB7nAeNURmC
+U4/8U/++URgyToaQsgE1PA8yd4jv239bXkc8Oa9RKFq/fLs/zb2bCI5WkC1pcbfm
+SdrvK73avM51zKN5u+UXa+VGJdUmAw3BuGz4U6WP/RQPX6xtoGTNMBoB4HMU
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.idiap.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.idiap.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">idiap.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Idiap Research Institute</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.idiap.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Idiap</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:help@idiap.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41277217777</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Idiap</md:GivenName>
+    <md:SurName>System Group</md:SurName>
+    <md:EmailAddress>mailto:aai@idiap.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41277217777</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/accesnoto.deboecksuperieur.com.xml b/swamid-interfederations-2.0/accesnoto.deboecksuperieur.com.xml
index 5ad99045..3a41f1cb 100644
--- a/swamid-interfederations-2.0/accesnoto.deboecksuperieur.com.xml
+++ b/swamid-interfederations-2.0/accesnoto.deboecksuperieur.com.xml
@@ -81,12 +81,12 @@ kb+1yGp1iVZqYSoJbQciM6hqlGjMEm4kllZC
       <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:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/aci-bookings.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/aci-bookings.sisoshibboleth.co.uk-entity.xml
new file mode 100644
index 00000000..33ca2965
--- /dev/null
+++ b/swamid-interfederations-2.0/aci-bookings.sisoshibboleth.co.uk-entity.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aci-bookings.sisoshibboleth.co.uk/entity">
+  <!--
+		This is a "SiSo London South Bank Online Resource Booking" Shibboleth SP for TechEthika Ltd.
+	-->
+  <Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/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="2016-04-06T14:39:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <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://aci-bookings.siso.co/sso/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://aci-bookings.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 London South Bank Online Resource Booking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SiSo London South Bank Resource Booking</mdui:Description>
+        <mdui:Logo height="64" width="64">https://shibboleth.siso.co/siso-logo64x64.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <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>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">SiSo South Bank Online Resource Booking</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Info</GivenName>
+    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Steven</GivenName>
+    <SurName>Oates</SurName>
+    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
+  </ContactPerson>
+</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
index e04286c8..40829ede 100644
--- a/swamid-interfederations-2.0/adfs01.fhs.se-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs01.fhs.se-adfs-services-trust.xml
@@ -17,8 +17,8 @@
         <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:Logo xml:lang="sv" height="118" width="106">https://www.fhs.se/files/sidhuvud/logotyp-sv.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="116" width="103">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>
@@ -56,28 +56,28 @@
     <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"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
   </md:IDPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="sv">Försvarshögskolan</md:OrganizationName>
diff --git a/swamid-interfederations-2.0/app-ca.tophat.com-sso-shibboleth-sp.xml b/swamid-interfederations-2.0/app-ca.tophat.com-sso-shibboleth-sp.xml
new file mode 100644
index 00000000..66f99fb1
--- /dev/null
+++ b/swamid-interfederations-2.0/app-ca.tophat.com-sso-shibboleth-sp.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://app-ca.tophat.com/sso/shibboleth/sp">
+  <!--
+		This is a "Top Hat" SP for Top Hat Monocle.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-22T12:47:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Top Hat</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Top Hat Classroom Response System</mdui:Description>
+        <mdui:Logo height="30" width="110">https://s3.amazonaws.com/thm-corporate/tophat-logo-blue.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDBTCCAe2gAwIBAgIJAJBdLHPlzYOPMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+						BAMTCnRvcGhhdC5jb20wHhcNMTQxMDE2MTg0OTU4WhcNMjQxMDEzMTg0OTU4WjAV
+						MRMwEQYDVQQDEwp0b3BoYXQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAtJvhoZ3zRb7UbxCE+NNCxTtUMwunQPa06R+JmvuYZdSOGwPW6W5ff3NE
+						Jm7S/EzcnXNeQLEdSombqATN5gOIo4vFfTpwBW/P5syvc0EBphXvoqkLeJcPrMm3
+						CR0QMerSe7i8xMXc/2o80aKHw5Cl99/ujvamrF6B+n4LbSi/Eo78G9JGIEFhOYYz
+						3UsGrm3b+pS9tn9NQXoCAL/YfUc70LV+CdKrxtW/psQMGjmbvR3saSnVoimyEcUq
+						dOhpyfYnVjNZsIANE/PoG4TYYU0zetTao5PD47mRIQ81FNxlXz2fg2LCzb8h06CU
+						Ri4NFAI7hBlZpQe+WhptkBa+gt5qgwIDAQABo1gwVjA1BgNVHREELjAsggp0b3Bo
+						YXQuY29thh51cm46bWFjZTp1bXUuc2U6c2FtbDp0b3BoYXQ6c3AwHQYDVR0OBBYE
+						FEN/h+ezcP/7CqNsqgpTxRWvbwTNMA0GCSqGSIb3DQEBBQUAA4IBAQCQmBmsKvMr
+						/PZVvszcGM9Ea/PulcPp0BbAHAdjaiFiw0SQkyaEY9fLi8yWOb/Gy0TVAGLxwBY7
+						dm6VZnVPxhvxL0RBswpJxs1XK4LYL0oj0ZHCHdQRktOBmuZ/rfkVheEBv8ek0sy5
+						shomaKJuTBEQd06ZeRZl71IUn6ytyUAp1ZCw3+bKh0cYYNzEYsd5PEq7yaG0tNTR
+						Z1eDZ10E6yP+f7eCFegs9qutMyxLhvefdGt2t4GvK4kbhjBRDAQwrAnXMixVkUkr
+						DsQPDtPsT1ONS2VZMmtQir8qUybJV5BfREoepLCOMIAbCRrRM0dQKK9C0HVXsNe3
+						F3yzDCsg02aQ
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDBTCCAe2gAwIBAgIJAJBdLHPlzYOPMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+						BAMTCnRvcGhhdC5jb20wHhcNMTQxMDE2MTg0OTU4WhcNMjQxMDEzMTg0OTU4WjAV
+						MRMwEQYDVQQDEwp0b3BoYXQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAtJvhoZ3zRb7UbxCE+NNCxTtUMwunQPa06R+JmvuYZdSOGwPW6W5ff3NE
+						Jm7S/EzcnXNeQLEdSombqATN5gOIo4vFfTpwBW/P5syvc0EBphXvoqkLeJcPrMm3
+						CR0QMerSe7i8xMXc/2o80aKHw5Cl99/ujvamrF6B+n4LbSi/Eo78G9JGIEFhOYYz
+						3UsGrm3b+pS9tn9NQXoCAL/YfUc70LV+CdKrxtW/psQMGjmbvR3saSnVoimyEcUq
+						dOhpyfYnVjNZsIANE/PoG4TYYU0zetTao5PD47mRIQ81FNxlXz2fg2LCzb8h06CU
+						Ri4NFAI7hBlZpQe+WhptkBa+gt5qgwIDAQABo1gwVjA1BgNVHREELjAsggp0b3Bo
+						YXQuY29thh51cm46bWFjZTp1bXUuc2U6c2FtbDp0b3BoYXQ6c3AwHQYDVR0OBBYE
+						FEN/h+ezcP/7CqNsqgpTxRWvbwTNMA0GCSqGSIb3DQEBBQUAA4IBAQCQmBmsKvMr
+						/PZVvszcGM9Ea/PulcPp0BbAHAdjaiFiw0SQkyaEY9fLi8yWOb/Gy0TVAGLxwBY7
+						dm6VZnVPxhvxL0RBswpJxs1XK4LYL0oj0ZHCHdQRktOBmuZ/rfkVheEBv8ek0sy5
+						shomaKJuTBEQd06ZeRZl71IUn6ytyUAp1ZCw3+bKh0cYYNzEYsd5PEq7yaG0tNTR
+						Z1eDZ10E6yP+f7eCFegs9qutMyxLhvefdGt2t4GvK4kbhjBRDAQwrAnXMixVkUkr
+						DsQPDtPsT1ONS2VZMmtQir8qUybJV5BfREoepLCOMIAbCRrRM0dQKK9C0HVXsNe3
+						F3yzDCsg02aQ
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app-ca.tophat.com/sso/shibboleth/slo"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app-ca.tophat.com/sso/shibboleth/acs" index="1"/>
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="en">Top Hat</ServiceName>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Top Hat Monocle</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Top Hat</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.tophat.com/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Support</GivenName>
+    <EmailAddress>mailto:support@tophat.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Brennan</GivenName>
+    <SurName>Green</SurName>
+    <EmailAddress>mailto:brennen@tophat.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Josh</GivenName>
+    <SurName>Jones</SurName>
+    <EmailAddress>mailto:josh@tophat.com</EmailAddress>
+  </ContactPerson>
+</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
index 9c2be07f..bc136e3c 100644
--- 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
@@ -14,7 +14,7 @@
         <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 height="128" width="120">https://appdb-dev.marie.hellasgrid.gr/images/appdblogo.png</mdui:Logo>
+        <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">
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
index 2b9d9b82..1546b87d 100644
--- 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
@@ -14,7 +14,7 @@
         <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 height="128" width="120">https://appdb-dev.marie.hellasgrid.gr/images/appdblogo.png</mdui:Logo>
+        <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">
diff --git a/swamid-interfederations-2.0/appdb.egi.eu-edugain-connect.xml b/swamid-interfederations-2.0/appdb.egi.eu-edugain-connect.xml
index e877b12a..24bcd4e5 100644
--- a/swamid-interfederations-2.0/appdb.egi.eu-edugain-connect.xml
+++ b/swamid-interfederations-2.0/appdb.egi.eu-edugain-connect.xml
@@ -14,7 +14,7 @@
         <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 height="128" width="120">https://appdb.egi.eu/images/appdblogo.png</mdui:Logo>
+        <mdui:Logo width="120" height="128">https://appdb.egi.eu/images/appdblogo.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/appdb.egi.eu-edugain-sp.xml b/swamid-interfederations-2.0/appdb.egi.eu-edugain-sp.xml
index 116d7812..ae09861e 100644
--- a/swamid-interfederations-2.0/appdb.egi.eu-edugain-sp.xml
+++ b/swamid-interfederations-2.0/appdb.egi.eu-edugain-sp.xml
@@ -14,7 +14,7 @@
         <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 height="128" width="120">https://appdb.egi.eu/images/appdblogo.png</mdui:Logo>
+        <mdui:Logo width="120" height="128">https://appdb.egi.eu/images/appdblogo.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/apps.csustan.edu-shibboleth.xml b/swamid-interfederations-2.0/apps.csustan.edu-shibboleth.xml
index c445084a..f9fccbb2 100644
--- a/swamid-interfederations-2.0/apps.csustan.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/apps.csustan.edu-shibboleth.xml
@@ -43,6 +43,11 @@ xFxzcdITxtRaIIG4
     </md:KeyDescriptor>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.csustan.edu/skillsoftimport/assertionservice.aspx" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.csustan.edu/test/skillsoftimport/assertionservice.aspx" index="2"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">CSUStan Apps</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">CSU Stanislaus App SP</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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">California State University, Stanislaus</md:OrganizationName>
diff --git a/swamid-interfederations-2.0/attributes.dfn.de-shibboleth.xml b/swamid-interfederations-2.0/attributes.dfn.de-shibboleth.xml
new file mode 100644
index 00000000..9522d895
--- /dev/null
+++ b/swamid-interfederations-2.0/attributes.dfn.de-shibboleth.xml
@@ -0,0 +1,103 @@
+<?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://attributes.dfn.de/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2016-03-27T08:57: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>
+  </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://attributes.dfn.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DFN-AAI Attribute Release Check</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DFN-AAI Attribute Release Check</mdui:DisplayName>
+        <mdui:Description xml:lang="de">DFN-AAI Attribute Release Check</mdui:Description>
+        <mdui:Description xml:lang="en">DFN-AAI Attribute Release Check</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:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>attributes.dfn.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=attributes.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGpjCCBY6gAwIBAgIHF2OL1rihizANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
+EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
+ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
+NDU3MTBaFw0xODExMzAyMjAwMDBaMHsxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
+ZXJsaW4xDzANBgNVBAcTBkJlcmxpbjETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcG
+A1UECxMQR2VzY2hhZWZ0c3N0ZWxsZTEaMBgGA1UEAxMRYXR0cmlidXRlcy5kZm4u
+ZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC7sYdxFM0KBJO8kdkO
++ZObNB6p3jRweiWv1SPHBqEv6rWW3YhhpWpS4HZLXeknsDIlCUuXgtJZA8qpN2yF
+3Ni6eN+HnU2HIVVu2tzAymi3Da28/O5ah1+jFrodrstgFsD464xESwEg6MR0DmDe
+sLCmgqheoafSCR6ywD6H3lI4ag6DrY9UyaXylH+hvxuC/1QhodeVR4EEnbKuh/sC
+PXo0/pMztdyoQ0LVzUJsrLsnNVH8XE8aeCKBft0vz+jHvjgxerUly52vsbp8RhMY
+IC1qwPPKptrDd5n0Xa7ZwN6qWiv4u2rIYlq04bcBlC8HYtKkYVs6yhCb70cgg0i6
+BUksRq8ysu4xFN/FD5QTwmEu6mtD2wq7cqbe/wG5MrGhpAw3DdmgeVU40GDi77Su
+UhFEDODLp36wWCkXLU8dsnw5Q/GgBXq3/AAaG/HtDu/OZrpdvzBrx/319ajKvkXE
+R5iytaJXqNIhxJs0RwnxBOVwSi4y5uZfXopLDbx2FXdAEhNiwahtMczh2oEbgkRG
+h2/wTYtd/WkzItAFU5lnSjG5xCm05b3sWxyfqasaEPHb794DZKjOxySclavfmj7/
+6l/PGamFxgs8Gn1/2uXh49KBZwxrXWuaA7DGQYwWk1gTX5fzbuYCqOpIZtKPWPhE
+956Y2JZIO7N0znsrpds/lxwFUwIDAQABo4ICSjCCAkYwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFEhQobEI3yzZOZYqEwcDLczWVkC2MB8GA1UdIwQYMBaAFHmi
+Yi/O8QY5Uud2bWLH3ptqdUtJMBwGA1UdEQQVMBOCEWF0dHJpYnV0ZXMuZGZuLmRl
+MIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGZu
+LXZlcmVpbi1ncy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEGgP6A9hjtodHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHViL2NybC9nX2NhY3Js
+LmNybDCB3wYIKwYBBQUHAQEEgdIwgc8wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3Nw
+LnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBLBggrBgEFBQcwAoY/aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jYWNlcnQvZ19j
+YWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rm
+bi12ZXJlaW4tZ3MtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcN
+AQELBQADggEBAMfRGQSUTw4k4XgOS+k4tyl3YjA/riAzNTWkt6ZUCA1O7NkiEbre
+PwA0FxAvRmEwy+aYaKcJ4IoTAZL/CJ/sD5ZoPhQZv7riGixrnKevB2RGbo+t2QFo
+yV14LeR8tEz0E7zNU1SJgEBs2jGdVDCIA1Pu5NkgrunDNChydOvPG5JlYNNVlrOU
+Xvt7a9viwGirOXnrkjVmJ9TdWg67m3wXFDrpiTh8iRMSy3gVCX3JST7CHxIkNOrg
+Ffv07p9wFJkh0CW+6Rc7J9gZ2jKQdI6mKMDRG7jFcl8D4b7gEP/7202V3u+y+T51
+ZO2bzztG/iSE3KsvU+yhFWeXFBN7iR2tSsQ=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://attributes.dfn.de/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://attributes.dfn.de/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://attributes.dfn.de/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://attributes.dfn.de/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://attributes.dfn.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://attributes.dfn.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://attributes.dfn.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://attributes.dfn.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">DFN-AAI Attribute Release Check</md:ServiceName>
+      <md:ServiceName xml:lang="en">DFN-AAI Attribute Release Check</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">DFN-AAI Attribute Release Check</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">DFN-AAI Attribute Release Check</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="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="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="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/auth.asiaportal.info.xml b/swamid-interfederations-2.0/auth.asiaportal.info.xml
index 6d3cb360..4be27498 100644
--- a/swamid-interfederations-2.0/auth.asiaportal.info.xml
+++ b/swamid-interfederations-2.0/auth.asiaportal.info.xml
@@ -5,7 +5,7 @@
       <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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-interfederations-2.0/auth.ut.ee-idp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/auth.ut.ee-idp-saml2-idp-metadata.php.xml
index 0a1a3c47..5f03de24 100644
--- a/swamid-interfederations-2.0/auth.ut.ee-idp-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/auth.ut.ee-idp-saml2-idp-metadata.php.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:IDPSSODescriptor WantAuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ut.ee</shibmd:Scope>
     </md:Extensions>
diff --git a/swamid-interfederations-2.0/averell.unimes.fr-authsaml2-metadata.xml b/swamid-interfederations-2.0/averell.unimes.fr-authsaml2-metadata.xml
index cf50473f..ea37f0cd 100644
--- a/swamid-interfederations-2.0/averell.unimes.fr-authsaml2-metadata.xml
+++ b/swamid-interfederations-2.0/averell.unimes.fr-authsaml2-metadata.xml
@@ -93,8 +93,8 @@ KLb8WUE=
       <md:ServiceDescription xml:lang="fr">Portail captif Univnautes - Université de Nîmes</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Eduspot - Nimes University</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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/beta.opendmc.org-shibboleth.xml b/swamid-interfederations-2.0/beta.opendmc.org-shibboleth.xml
index 1c7a062b..64c60d84 100644
--- a/swamid-interfederations-2.0/beta.opendmc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/beta.opendmc.org-shibboleth.xml
@@ -4,6 +4,7 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
         <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
@@ -49,8 +50,11 @@ hU0A+rBmSlUbyIYzE6NGHu4Z5qUCvGXmPK/pekoMhXlP7yNwew==
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">OpenDMC-Beta</md:ServiceName>
       <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
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
index 36947b9a..be222eeb 100644
--- a/swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml
@@ -25,23 +25,28 @@
       <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
+MIID9DCCAtwCCQDDKKmEOwqI4DANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+SVQxEDAOBgNVBAcTB0JvbG9nbmExDjAMBgNVBAgTBUl0YWx5MSwwKgYDVQQKEyND
+TlIgLSBBcmVhIGRlbGxhIFJpY2VyY2EgZGkgQm9sb2duYTETMBEGA1UECxMKQmli
+bGlvdGVjYTEeMBwGA1UEAxMVYmlibGlvLXNlcnYuYm8uY25yLml0MScwJQYJKoZI
+hvcNAQkBFhhhLnR1Z25vbGlAYXJlYS5iby5jbnIuaXQwHhcNMTYwMzMwMDgyMDI3
+WhcNNDYwMzIzMDgyMDI3WjCBuzELMAkGA1UEBhMCSVQxEDAOBgNVBAcTB0JvbG9n
+bmExDjAMBgNVBAgTBUl0YWx5MSwwKgYDVQQKEyNDTlIgLSBBcmVhIGRlbGxhIFJp
+Y2VyY2EgZGkgQm9sb2duYTETMBEGA1UECxMKQmlibGlvdGVjYTEeMBwGA1UEAxMV
+YmlibGlvLXNlcnYuYm8uY25yLml0MScwJQYJKoZIhvcNAQkBFhhhLnR1Z25vbGlA
+YXJlYS5iby5jbnIuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5
+Sv5rRfMx/i+VbaR6FmuPGHqcJJ9V+IfbYNVu+/p6qOg+pFwqg5ZuaF674aQ1dczN
+hVgJOEG7p3TjUAGAqX46iURqX0bXVkOzwLKfXLhfqAKPr9eMSoWz6RAk0/IAQaZT
+58XEHpwTBxLqgDrH5M6gMNfXg7wY+iBsvhNakVp8Sw9vW7KiVT/fQSNu3EDSP0pB
+iqJOtUErupGBk8SdBvc1mI9ue5QkakcjsqnKdLI6cQ9jHIn4bUSBMmL3Q4b9q/0A
+/PlY4ZX29HzhGCJ8KrhpRzMjSf5CY317RSQNE9bI8KBkdng1ll8H47L7QM7Hig2P
+C5htmoaJA4Qx8omwc8uNAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACsPRjQctB8Z
+4IM9iJnImqaOYamRDiRJuSTlEZ/dB2mmRf4UsQIBk6nyQY1/cGxamq6SWKUli1fR
+9NthLGYth+CKGV7CbrLYSRWleKTpJ2SKMG9AvtrgavY6ca6AxL6p3yckM71Eonx1
+BB0TdrYQKHiUhbbB9kXMXJNWC/fcd7comscB918uh0GynoYxXSowdnGl+OSZerti
+D69Oez5fVQ4PDv1iV3Uqd8zcUqxfsa9zX2UL4pnmHMANxFeWI4+om7rTFC0btcKQ
+IwD0Nf/pB+PAFyLHQPBrEjofpdriNJFDiDjW/+4yPxwnlQcMwXpBy4fK21gZCBqu
+LdV4oWGgz10=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -66,23 +71,28 @@ U54oXUKAY4FIYbrat+RdEKwrq3NlApysLNVT2glyptc217T7w0JuMUgwTb3DXyG+
       <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
+MIID9DCCAtwCCQDDKKmEOwqI4DANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+SVQxEDAOBgNVBAcTB0JvbG9nbmExDjAMBgNVBAgTBUl0YWx5MSwwKgYDVQQKEyND
+TlIgLSBBcmVhIGRlbGxhIFJpY2VyY2EgZGkgQm9sb2duYTETMBEGA1UECxMKQmli
+bGlvdGVjYTEeMBwGA1UEAxMVYmlibGlvLXNlcnYuYm8uY25yLml0MScwJQYJKoZI
+hvcNAQkBFhhhLnR1Z25vbGlAYXJlYS5iby5jbnIuaXQwHhcNMTYwMzMwMDgyMDI3
+WhcNNDYwMzIzMDgyMDI3WjCBuzELMAkGA1UEBhMCSVQxEDAOBgNVBAcTB0JvbG9n
+bmExDjAMBgNVBAgTBUl0YWx5MSwwKgYDVQQKEyNDTlIgLSBBcmVhIGRlbGxhIFJp
+Y2VyY2EgZGkgQm9sb2duYTETMBEGA1UECxMKQmlibGlvdGVjYTEeMBwGA1UEAxMV
+YmlibGlvLXNlcnYuYm8uY25yLml0MScwJQYJKoZIhvcNAQkBFhhhLnR1Z25vbGlA
+YXJlYS5iby5jbnIuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5
+Sv5rRfMx/i+VbaR6FmuPGHqcJJ9V+IfbYNVu+/p6qOg+pFwqg5ZuaF674aQ1dczN
+hVgJOEG7p3TjUAGAqX46iURqX0bXVkOzwLKfXLhfqAKPr9eMSoWz6RAk0/IAQaZT
+58XEHpwTBxLqgDrH5M6gMNfXg7wY+iBsvhNakVp8Sw9vW7KiVT/fQSNu3EDSP0pB
+iqJOtUErupGBk8SdBvc1mI9ue5QkakcjsqnKdLI6cQ9jHIn4bUSBMmL3Q4b9q/0A
+/PlY4ZX29HzhGCJ8KrhpRzMjSf5CY317RSQNE9bI8KBkdng1ll8H47L7QM7Hig2P
+C5htmoaJA4Qx8omwc8uNAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACsPRjQctB8Z
+4IM9iJnImqaOYamRDiRJuSTlEZ/dB2mmRf4UsQIBk6nyQY1/cGxamq6SWKUli1fR
+9NthLGYth+CKGV7CbrLYSRWleKTpJ2SKMG9AvtrgavY6ca6AxL6p3yckM71Eonx1
+BB0TdrYQKHiUhbbB9kXMXJNWC/fcd7comscB918uh0GynoYxXSowdnGl+OSZerti
+D69Oez5fVQ4PDv1iV3Uqd8zcUqxfsa9zX2UL4pnmHMANxFeWI4+om7rTFC0btcKQ
+IwD0Nf/pB+PAFyLHQPBrEjofpdriNJFDiDjW/+4yPxwnlQcMwXpBy4fK21gZCBqu
+LdV4oWGgz10=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml
index 762f2beb..590e79c8 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/adfs.smk.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-07-15T16:08:06Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-07-15T16:08:06Z" 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>
@@ -54,6 +54,6 @@ iaCTH9LM7/F3Hd+I
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml
index cc4c9a48..6a6a119d 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/auth.dsl.dk/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-09-21T14:47:42Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-09-21T14:47:42Z" 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>
@@ -55,6 +55,6 @@ Yddwdo55oZyYRtYPfvbI7ThZ1slkiND3U2W3u3G/XgbN0Jd8Mp6UBnLttIqus3iK
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml
index ed405ff7..87ef0225 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/auth.msk.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-06-26T11:11:53Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-26T11:11:53Z" 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>
@@ -53,6 +53,6 @@ Y0vFLNNUbts2J7AXDQK28bn0u2mnK6aC2eFqEgcTU6xg+qQbj81PxKigfSJRsh+R
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml
index 15403f6c..43cd5b6e 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/cas.cbs.dk/saml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2013-08-09T09:53:44Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2013-08-09T09:53:44Z" 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>
@@ -53,6 +53,6 @@ Zd682vK8XDpmc0mzv5AP2Bncmy2W1upHBNE=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml
index 2ee8f5af..a76ed2a5 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/det.kristne-gym.dk/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2011-10-25T12:46:26Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2011-10-25T12:46:26Z" 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>
@@ -54,6 +54,6 @@ bNSPxoYF
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
index 293735c4..59552797 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/drcmr.dk:667/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-07-02T11:54:25Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-07-02T11:54:25Z" 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>
@@ -53,6 +53,6 @@ NNHD2yvkSucskE/3RZ6PzZLyXCqpyLE79J6EDbrO1gKPs6Kjqg5W0ljY
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml
index 7ab1155b..ca5e4b5e 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/federation.ku.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2014-05-06T13:32:41Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2014-05-06T13:32:41Z" 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>
@@ -53,6 +53,6 @@ oDZnFjBuo5Hw31Z+O4L9t4eVzBM=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
index 1c82d671..297eb0e2 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/fg.ucsyd.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-08-24T10:04:27Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-08-24T10:04:27Z" 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>
@@ -54,6 +54,6 @@ UFdljlsuM44ZHRRTQB7UThOzNtQaqFViwo1G86pznm4OQ5WhZqzFO8eoPb8bBtrk
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
index 780083dd..b7525e7a 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/fs.dskd.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-05-27T15:12:32Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-05-27T15:12:32Z" 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>
@@ -53,6 +53,6 @@ dPcr9FHbXBQ=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml
index 28d88d90..958e4a20 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/fs.edu.simac.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-08-05T14:39:40Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-08-05T14:39:40Z" 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>
@@ -53,6 +53,6 @@ fwnoK0wK5Qy+Hac98sg1DygI
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml
index 44528524..a4673b7c 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/idp.fms.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-05-26T14:37:57Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-05-26T14:37:57Z" 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>
@@ -53,6 +53,6 @@ Kz+Iv2SAMUA=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml
index 70312986..d64bbb42 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/idp.umit.dk">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2014-01-02T14:49:44Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2014-01-02T14:49:44Z" 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>
@@ -52,6 +52,6 @@ Wma0d+CKLHPagLmm29t8EF37hZE=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml
index 8c47c243..a063c8da 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/kadk-idp.wayf.kb.dk">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2012-01-12T09:31:21Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-01-12T09:31:21Z" 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>
@@ -52,6 +52,6 @@ rBue0WdqjxUhj4Yyw2JK3w2jM3vzSNu7HWJ8AIBKco5rG/vo
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
index b9f5cdde..4795f2b4 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/orphanage.wayf.dk">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T13:41:26Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:41:26Z" 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>
@@ -54,6 +54,6 @@ I81cWocYw/rsAD2kW5C5T1nMZBlgoYk/+yXoXXGHuEI=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml
index 89370a38..70502449 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/saml.pharmakon.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2011-12-22T11:57:11Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2011-12-22T11:57:11Z" 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>
@@ -54,6 +54,6 @@ HM6p9FnQoiWszraaknJsQ8E+fjjqZ1dY
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml
index c8dfcd52..eab832bf 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/saml.sso.eucnord.net/">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-06-14T14:53:56Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-14T14:53:56Z" 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>
@@ -53,6 +53,6 @@ t3FWDnyLxXBh+nay2r+6OQNF/HI0V54HHHXpFhvg3pAfZSmrhjI=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml
index 86126982..77107bea 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/saml.sso3.phmetropol.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2014-01-24T10:23:07Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2014-01-24T10:23:07Z" 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>
@@ -53,6 +53,6 @@ d3A0FABe5reA+KtzVrTieVTjWHGQtF2W1mNkWx2Gi1lGu25F
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml
index 36aaf8a2..85dc2d27 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/saml1.dmjx.dk/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-06-10T12:02:31Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-10T12:02:31Z" 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>
@@ -53,6 +53,6 @@ sIsugcTH6K28MleLFhFT1ZJ8bJ4C5QRPixp3NRKK/pTRUi24c/NtsxiW2I8=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
index afe99dec..40053178 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.basyd.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-06-14T14:50:42Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-14T14:50:42Z" 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>
@@ -53,6 +53,6 @@ h8V01qfDTMmw4ASc
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml
index f34bd365..23819594 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/sso.drlund-gym.dk">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T13:30:42Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:30:42Z" 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>
@@ -54,6 +54,6 @@ dQDb0gK1ALtFHsR6o+DkLOvLyImsQq8zCLwhzROY4ig=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml
index 65ead9c1..0661bcd4 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.eal.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-06-14T14:53:02Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-14T14:53:02Z" 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>
@@ -54,6 +54,6 @@ uVff9vzTPfw=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml
index 3b6404fb..a83d98d3 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.eamv.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-06-14T14:51:55Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-14T14:51:55Z" 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>
@@ -53,6 +53,6 @@ mZA0QGYfa1EL1Q==
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml
index f6e2b77e..8be4a74b 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.hrs.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2012-05-16T22:43:37Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-05-16T22:43:37Z" 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>
@@ -54,6 +54,6 @@ H8vDIZSNJeoj/SitEpgjanw5oNXtqn16gZcB2v/fPs2qDbs636amU6ELoV0gpQjv
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml
index c93868d8..8d1a0a0f 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.rosborg-gym.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2014-04-04T11:23:45Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2014-04-04T11:23:45Z" 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>
@@ -54,6 +54,6 @@ GG6TK2xCAz6z3j5/OuMvrJGZ8BTGt2QC
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml
index a8c9a944..f6e24f15 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.sde.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2012-03-27T09:31:23Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-03-27T09:31:23Z" 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>
@@ -53,6 +53,6 @@ HkNhvouMOcU=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml
index bf7356b8..48e8901c 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/sso.sdu.dk/wayf">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T13:36:49Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:36:49Z" 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>
@@ -54,6 +54,6 @@ jZehS9P/tKKffrsqCxpzGtwrXTEfxfMsmYVKeQ==
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml
index ae21b082..428f515a 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/sso.ucl.dk/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T13:38:14Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:38:14Z" 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>
@@ -53,6 +53,6 @@ uZJ5q8OhIN1jFsxF2xY8T+xaHvObuZJ9246bmlRQrtx7fAkCtyfCN9zPu0STf68+
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml
index ec416d7a..89eaa2d5 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/sso.ucsj.dk:443/idp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-20T13:41:22Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-20T13:41:22Z" 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>
@@ -52,6 +52,6 @@ TrFmg+sXdlIbAI8kQgy2xotEFE/2sXYFDC+fCZ838tg7R7cF
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml
index fe4f04fc..70351d51 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sts.statsbiblioteket.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-06-03T11:53:23Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-03T11:53:23Z" 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>
@@ -54,6 +54,6 @@ b45SXMc+awoz7kMadUeuovVtd6ETEsnnNquJ7navnN/e7w==
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml
index 5a45682c..557dee11 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/ucnsso.ucn.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-06-09T09:51:19Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-09T09:51:19Z" 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>
@@ -53,6 +53,6 @@ I7eDefwR237lfmpOKMk=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
index e1cb824f..c1ddb0cd 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.aams.dk/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-06-10T11:47:30Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-10T11:47:30Z" 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>
@@ -53,6 +53,6 @@ y6n+48evSVkVMMX88HffZUVp9ZyNULPR3CbMua8+D0Omtx6NhUN9QPoE
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml
index 2cb671ee..a833dee0 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.aau.dk">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-12-06T14:25:53Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-12-06T14:25:53Z" 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>
@@ -54,6 +54,6 @@ YNCobCjLM8GtgKPZGSBhP+avu6w=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
index 578c9060..1797c6c5 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.ait.dtu.dk/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2012-02-03T13:34:44Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-02-03T13:34:44Z" 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>
@@ -53,6 +53,6 @@ yPzz3RRNmKq5lLVVYikx8FVc4IVMw9++ixM=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml
index 8aebfd43..fa131cfe 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.akademiaarhus.dk/simplesaml-eaa/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-06-14T14:44:25Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-14T14:44:25Z" 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>
@@ -54,6 +54,6 @@ DdbjKB6UO7mTuqPKUxkGG2oviO3YApEyi1jggBDOeblg450UyjsTJcivVg2prmgB
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml
index 16df17f2..a29faf11 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.au.dk">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2012-07-26T08:47:03Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-07-26T08:47:03Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
@@ -52,6 +52,6 @@ waSgkcygO9PTBU5lKpmYMlUx
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
index 1b744291..6f8d7cc9 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.frhavn-gym.dk/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2012-11-15T14:53:18Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-11-15T14:53:18Z" 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>
@@ -54,6 +54,6 @@ DoLyd1u8
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
index 9f32baa5..887eac87 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.hi.is/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T13:31:35Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:31:35Z" 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>
@@ -53,6 +53,6 @@ dGs7tUiZlHqo6haH9iSvsbsBOq6pPaZR8cX1As206778PAS6Q6U=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml
index c25bdc4c..9d34819c 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.ibc.dk/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T14:05:34Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T14:05:34Z" 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>
@@ -55,6 +55,6 @@ fxDMnDXCEVeGDaSfpKS59rujNM6pWzUKYjZQiokpUDvikcroFe8BbdhqDwndle76
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
index f274bde8..9377e793 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.itu.dk/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T13:40:44Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:40:44Z" 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>
@@ -55,6 +55,6 @@ AQAN4xTeTap6sBe0PnPwfOfw8dqIaPHDqMmY0HsPSjxWsUHvBhtLFOi1dddIXjw8
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml
index a916858c..14ee49fc 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.kea.dk/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2013-07-24T15:44:02Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2013-07-24T15:44:02Z" 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>
@@ -53,6 +53,6 @@ p+TiM/eBbXCraZ32+zNbKfPC
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml
deleted file mode 100644
index 6b21f5b1..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.kum.dk/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2011-10-27T13:39:42Z" 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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dsn.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Dansk Sprognævn</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Danish Language Council</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>dsn.dk</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>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cHM6Ly93
-YXlmLmt1bS5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1MDEwMTAwMDAw
-MFoXDTI1MTIzMTIzNTk1OVowNTEzMDEGA1UEAwwqaHR0cHM6Ly93YXlmLmt1bS5k
-ay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDa
-lbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQ
-x72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2E
-jXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsY
-tLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmeb
-d+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-AQCrWx3Zrlrbj1kGSlbADTE1MQ40Q0dN+A9HdEUrt68BvTgvr0Qz5pinXL3gFFMv
-YgSprMT/PAGuXJeRiaxWFi6vsUbM8ie4KnP1tUsDvlKTGt8yZRzbiHBPJ+cl7iM/
-iNeJWFcLFamx4uXc0Lrn0mYdQCiknB6OOF11zl837WxOZILuFa7eZanR286emuIo
-JY3Dihrlt0esADrBci2CwRwSljlSJ/Y4FW+7bD8KY2ObxbQSxhzoeiDD8lSbOrVO
-cKGhtXil7cspCMSTbNpbSpIcgel6CauLSRw5R2qJBAd7KHm6eQGBOXzVDIOQR3tc
-j2IrcoJ3QM317FlrycurdCEq
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/wayf.kum.dk/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Dansk Sprognævn</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Danish Language Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Dansk Sprognævn</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Danish Language Council</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.dsn.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.dsn.dk</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/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml
index f1b0909b..716331a6 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/dab">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-10-28T09:45:22Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-10-28T09:45:22Z" 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>
@@ -52,6 +52,6 @@ v93+XEHzeHHw5pwvSa0YWMs2hXkVYFnHrTicG9bEV6qKoNYG
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml
index f5eb6694..a2de999c 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/fsv">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-10-28T09:51:27Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-10-28T09:51:27Z" 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>
@@ -52,6 +52,6 @@ G9baPBH3swAjkG8Aa/+wabJPIBCF5mR8nO9gQQk4wgs17mS6
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml
index de6c3ede..6519e816 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/wayf.regionsjaelland.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-04-28T14:44:42Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-04-28T14:44:42Z" 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>
@@ -53,6 +53,6 @@ FCi7nKlzaklaH/SOTHq/dQBIWfezdWZwzJez/ZlcHeFV8g==
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml
index e30ac65f..798d8919 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.ruc.dk/idp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T13:34:58Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:34:58Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
@@ -52,6 +52,6 @@ LvJ2p7KuCR1XMFXRBimf3zUsLH5CKx4AOaUJ+A==
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml
index a37bb173..4f010773 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.rungsted-gym.dk/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T14:07:25Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T14:07:25Z" 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>
@@ -53,6 +53,6 @@ r/xz9uFt2RzjLOXXnNTxdxNYM+57s7iSEGi7ysNfGUZJ8IY8sv2qGwGpYRcE+M6f
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml
index 399a2cfc..a69bf1ec 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/aip/saml2/idp/metadata.php?unit=aip">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T13:52:57Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:52:57Z" 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>
@@ -56,6 +56,6 @@ LV8Nl3w74u1j520EDfu3HQ==
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml
index 5f018a08..0814c6cc 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/gg/saml2/idp/metadata.php?unit=gg">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T13:55:36Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:55:36Z" 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>
@@ -56,6 +56,6 @@ Z8bY2QouT70h3w+L
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml
index 45e8075d..883bb3da 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/its/saml2/idp/metadata.php?unit=its">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T14:02:17Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T14:02:17Z" 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>
@@ -54,6 +54,6 @@ YWDGqSgnwi1H313Tol8U/A==
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml
index ed722825..e8812f84 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/mg/saml2/idp/metadata.php?unit=mg">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T13:56:14Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:56:14Z" 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>
@@ -56,6 +56,6 @@ gldjnwhQkoXCB2mN
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml
index dfdcf74c..b92ada72 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/sska/saml2/idp/metadata.php?unit=sska">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T13:59:09Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:59:09Z" 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>
@@ -56,6 +56,6 @@ q1H8RSir+nACRQ/fLPgySCU97iU=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml
index 7dad6485..23d5a547 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/sss/saml2/idp/metadata.php?unit=sss">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T13:59:19Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:59:19Z" 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>
@@ -56,6 +56,6 @@ Z0FIk7cDlCfAO6WS9Da4VQ==
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml
index aa1a737e..85d96402 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.ucc.dk/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T13:33:31Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:33:31Z" 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>
@@ -55,6 +55,6 @@ XUPP28ILRNV6EqIHjKw4XqDP
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml
index 6b2c1511..8daa2096 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.viauc.dk/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2010-08-17T13:39:34Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:39:34Z" 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>
@@ -55,6 +55,6 @@ p2YMU09Pb33T82fJfzyq0fwa2AhboACWsblekPEHoMxrzNQUuKzcoGbK+WI=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml
index 634bc60d..3ba4ca3f 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayfa.efif.dk/cph/module.php/saml/sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-06-10T11:56:43Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-10T11:56:43Z" 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>
@@ -53,6 +53,6 @@ tPD3c+RitftZZdVVSFgdbMdcTZ3log==
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml
index 0572340a..0ea8336f 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayfa.efif.dk/fg/module.php/saml/sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2011-02-02T13:02:24Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2011-02-02T13:02:24Z" 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>
@@ -55,6 +55,6 @@ Wl7WIRfFhXMrMTMiDDMGbZpFe+s=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml
index 55d8871f..655583f4 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayfa.efif.dk/hss/module.php/saml/sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2013-04-30T14:07:37Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2013-04-30T14:07:37Z" 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>
@@ -53,6 +53,6 @@ adTtql0la2qKXumMxXSsTKT5/gU1yg==
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml
index f0bf05f9..cbe6254e 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayfa.efif.dk/kn/module.php/saml/sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2012-08-23T14:24:59Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-08-23T14:24:59Z" 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>
@@ -53,6 +53,6 @@ oTQy5sOe4dSs2/n4/PlkBFwsHcE=
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml
index 0c23b7b0..48b4690a 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayfa.efif.dk/vor/module.php/saml/sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2011-08-31T12:35:39Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2011-08-31T12:35:39Z" 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>
@@ -55,6 +55,6 @@ AKktIsPch1tYllp+fb1/Be5pd2o+Aw==
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml
index 5ff6eb21..d322b706 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayfeadania.itcn.dk/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2014-08-21T11:09:38Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2014-08-21T11:09:38Z" 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>
@@ -54,6 +54,6 @@ lsZ14BWXRzkq1VI5Y+Zp/Zq3t8JSNW+T0O/TJXvjt5mdYhu9YKFTMVMujjE4v7qv
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</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
index cacc0312..2b963785 100644
--- 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
@@ -5,7 +5,7 @@
       <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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
@@ -47,16 +47,16 @@
     <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:RequestedAttribute FriendlyName="email" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" isRequired="true" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="surname" isRequired="true" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" isRequired="true" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" isRequired="false" 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.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="false"/>
+      <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="false"/>
+      <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" isRequired="false"/>
+      <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="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
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
index 8cf69a60..9487dc5c 100644
--- a/swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml
@@ -14,31 +14,24 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIEhDCCA2ygAwIBAgIRAMLq8DxqQ9VM4MxH2N6y4W0wDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MDkwMDAwMDBaFw0xNjA0MDgyMzU5NTlaMEkxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbYndpZHBzMTIw
+						MIIDVzCCAj+gAwIBAgIUWglMTleZvuGO2irbas9hPuOnw8cwDQYJKoZIhvcNAQEF
+						BQAwJjEkMCIGA1UEAxMbYndpZHBzMTIwMS5icmlkZ3dhdGVyLmFjLnVrMB4XDTE2
+						MDMzMDE1NDcxMloXDTM2MDMzMDE1NDcxMlowJjEkMCIGA1UEAxMbYndpZHBzMTIw
 						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=
+						AQEAlzo/yhgOYNr78GcF+NibB+xvfiLVklruENiGKZ4rAJcyJZn8bPXYIjOjFyCd
+						GfIoVsrQlKba7lY0FVy+2BpL0SgvkOMHcWR6qD1mei3YUtram52EAgYRMA3tpIRZ
+						jQsmTUAC69Oo14juNbJiGzj7HvckO667LFh9DHSO/mrQQVdV8zeF0Wn8T1w4Vnz6
+						L97G3HFQT3CyRGmHmb6nz+hTxab2Dh9FWLpLzXBUaHpIFcrbgOQIX4gEmtrwNfyS
+						c+wLCV7bdU4Gh51GZTCWoBDHVCCmeNZkh1L//RpPO0kfHi2sxToYGOIqp/OWLj94
+						v7McDsSIHHd7/A+eronEjDdXeQIDAQABo30wezBaBgNVHREEUzBRghtid2lkcHMx
+						MjAxLmJyaWRnd2F0ZXIuYWMudWuGMmh0dHBzOi8vYndpZHBzMTIwMS5icmlkZ3dh
+						dGVyLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSayEIGuSvvwYzBRK5w
+						W6OkdfC5XjANBgkqhkiG9w0BAQUFAAOCAQEASEPLE48coXwXRqtDu6Bi1Q95s21/
+						CI7z0nexqi6M05fGp/SmnXqHCoL2zd3yLpVorWJvzvPMWjeX/WVK53G/ngMa8WyV
+						oJGahuOK2VKeQG/d8Hy7HxflmNyBgpfy/VLxRBWMTM7gqoaoxNW/CIryWiDbiWj+
+						VnJyrLsH2AmpOnhytKgzfleVCFRguh8J+d8TQRY1qWGkA2lD4+6KFBOyrfQzVtqr
+						hpdbpuB4A6v1fnIPgaLFQE9FYSY6T7M3jo8mf/9b4r98LswNPGSt3RJkXVDMB0z6
+						sNCUPNL/Y6Q8KAkMTMJOMYcXvoCuZNqCg89Kt2RigmpCF1p0KX0T8DS/cQ==
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -60,31 +53,24 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIEhDCCA2ygAwIBAgIRAMLq8DxqQ9VM4MxH2N6y4W0wDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MDkwMDAwMDBaFw0xNjA0MDgyMzU5NTlaMEkxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbYndpZHBzMTIw
+						MIIDVzCCAj+gAwIBAgIUWglMTleZvuGO2irbas9hPuOnw8cwDQYJKoZIhvcNAQEF
+						BQAwJjEkMCIGA1UEAxMbYndpZHBzMTIwMS5icmlkZ3dhdGVyLmFjLnVrMB4XDTE2
+						MDMzMDE1NDcxMloXDTM2MDMzMDE1NDcxMlowJjEkMCIGA1UEAxMbYndpZHBzMTIw
 						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=
+						AQEAlzo/yhgOYNr78GcF+NibB+xvfiLVklruENiGKZ4rAJcyJZn8bPXYIjOjFyCd
+						GfIoVsrQlKba7lY0FVy+2BpL0SgvkOMHcWR6qD1mei3YUtram52EAgYRMA3tpIRZ
+						jQsmTUAC69Oo14juNbJiGzj7HvckO667LFh9DHSO/mrQQVdV8zeF0Wn8T1w4Vnz6
+						L97G3HFQT3CyRGmHmb6nz+hTxab2Dh9FWLpLzXBUaHpIFcrbgOQIX4gEmtrwNfyS
+						c+wLCV7bdU4Gh51GZTCWoBDHVCCmeNZkh1L//RpPO0kfHi2sxToYGOIqp/OWLj94
+						v7McDsSIHHd7/A+eronEjDdXeQIDAQABo30wezBaBgNVHREEUzBRghtid2lkcHMx
+						MjAxLmJyaWRnd2F0ZXIuYWMudWuGMmh0dHBzOi8vYndpZHBzMTIwMS5icmlkZ3dh
+						dGVyLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSayEIGuSvvwYzBRK5w
+						W6OkdfC5XjANBgkqhkiG9w0BAQUFAAOCAQEASEPLE48coXwXRqtDu6Bi1Q95s21/
+						CI7z0nexqi6M05fGp/SmnXqHCoL2zd3yLpVorWJvzvPMWjeX/WVK53G/ngMa8WyV
+						oJGahuOK2VKeQG/d8Hy7HxflmNyBgpfy/VLxRBWMTM7gqoaoxNW/CIryWiDbiWj+
+						VnJyrLsH2AmpOnhytKgzfleVCFRguh8J+d8TQRY1qWGkA2lD4+6KFBOyrfQzVtqr
+						hpdbpuB4A6v1fnIPgaLFQE9FYSY6T7M3jo8mf/9b4r98LswNPGSt3RJkXVDMB0z6
+						sNCUPNL/Y6Q8KAkMTMJOMYcXvoCuZNqCg89Kt2RigmpCF1p0KX0T8DS/cQ==
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/cafe.ufpel.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ufpel.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..fe7e109b
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ufpel.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://cafe.ufpel.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">UFPel - Universidade Federal de Pelotas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFPel - Universidade Federal de Pelotas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFPel - Universidade Federal de Pelotas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFPel - Universidade Federal de Pelotas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufpel.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufpel.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>
+    MIID9jCCAt4CAQAwDQYJKoZIhvcNAQEFBQAwgcAxMDAuBgNVBAoTJ1VGUGVsIC0g
+VW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgUGVsb3RhczESMBAGA1UECxMJQ1RJLVJl
+ZGVzMSEwHwYJKoZIhvcNAQkBFhJyZWRlc0B1ZnBlbC5lZHUuYnIxEDAOBgNVBAcT
+B1BlbG90YXMxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJC
+UjEaMBgGA1UEAxMRY2FmZS51ZnBlbC5lZHUuYnIwHhcNMTYwMjAzMTI0MjU4WhcN
+MTkwMjAyMTI0MjU4WjCBwDEwMC4GA1UEChMnVUZQZWwgLSBVbml2ZXJzaWRhZGUg
+RmVkZXJhbCBkZSBQZWxvdGFzMRIwEAYDVQQLEwlDVEktUmVkZXMxITAfBgkqhkiG
+9w0BCQEWEnJlZGVzQHVmcGVsLmVkdS5icjEQMA4GA1UEBxMHUGVsb3RhczEaMBgG
+A1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFj
+YWZlLnVmcGVsLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKe6wNljSw+nFuwJHZWc9LEPraUrwTUmxVrZ7GQCrWQmw6Sci5cJU+qHGfN8r/Ca
+X/VqkJPk9IheSpzsvU+Jj5X0TUmG5HBhVHc5zsDaGdLxTmPPL8tMS8ZNJpzU7/vY
+JEH3rOYmW6ZQI44tiO+1/xS2NVBbDAd0QqNcz11tjSSe59Zg0mVi4xSePCcYT295
+B0ZcEkeFmPX38SZ8gw3AOGlCBmFFhkjUZ1WO1/K3qJpL716HJU2GlaZ4gB4FS2dz
+VbeebsT/hon8Pc+OkqZnJUiL3BrKkoPF0OhgP99ZAzb+Zp60lMzPbCd4oz3aJSh7
+23cIyqy1RDSvJX6Mn9XmKrsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAi3uyG/Sn
+FTbkDgpF1bK82QPwDs06lwy8Nf1Ob0lYCn9m76OIk4deCeBTTak98bLyN0VVmMUU
+CFsMMonKBkyDOOA3HZYZ5cxBw+3PZLa8Vb8PJ4siub9cgO+VMhN5sLrLU9LLf7H+
+Y0s+csJy3VSpe77RY+orKjNZHN9znrJN2tHYUtvsuhzQhDddEJ14y4XbHbao1KD6
+EXoDP3ldJUoUo3wDA3eN6urbwGYD/UNYWmT0hBUGoqFwwmCGv9oFWXHE8u3h6tMV
+aeix9kmKvF9h4GRe0+sqKoK44rQsbmrVjIAzSmjTyuqjmdppEjNboPIVGh109g5m
+7n6tw8BmIk3amQ==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufpel.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.ufpel.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.ufpel.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufpel.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufpel.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufpel.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>
+      
+MIID9jCCAt4CAQAwDQYJKoZIhvcNAQEFBQAwgcAxMDAuBgNVBAoTJ1VGUGVsIC0g
+VW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgUGVsb3RhczESMBAGA1UECxMJQ1RJLVJl
+ZGVzMSEwHwYJKoZIhvcNAQkBFhJyZWRlc0B1ZnBlbC5lZHUuYnIxEDAOBgNVBAcT
+B1BlbG90YXMxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJC
+UjEaMBgGA1UEAxMRY2FmZS51ZnBlbC5lZHUuYnIwHhcNMTYwMjAzMTI0MjU4WhcN
+MTkwMjAyMTI0MjU4WjCBwDEwMC4GA1UEChMnVUZQZWwgLSBVbml2ZXJzaWRhZGUg
+RmVkZXJhbCBkZSBQZWxvdGFzMRIwEAYDVQQLEwlDVEktUmVkZXMxITAfBgkqhkiG
+9w0BCQEWEnJlZGVzQHVmcGVsLmVkdS5icjEQMA4GA1UEBxMHUGVsb3RhczEaMBgG
+A1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFj
+YWZlLnVmcGVsLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKe6wNljSw+nFuwJHZWc9LEPraUrwTUmxVrZ7GQCrWQmw6Sci5cJU+qHGfN8r/Ca
+X/VqkJPk9IheSpzsvU+Jj5X0TUmG5HBhVHc5zsDaGdLxTmPPL8tMS8ZNJpzU7/vY
+JEH3rOYmW6ZQI44tiO+1/xS2NVBbDAd0QqNcz11tjSSe59Zg0mVi4xSePCcYT295
+B0ZcEkeFmPX38SZ8gw3AOGlCBmFFhkjUZ1WO1/K3qJpL716HJU2GlaZ4gB4FS2dz
+VbeebsT/hon8Pc+OkqZnJUiL3BrKkoPF0OhgP99ZAzb+Zp60lMzPbCd4oz3aJSh7
+23cIyqy1RDSvJX6Mn9XmKrsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAi3uyG/Sn
+FTbkDgpF1bK82QPwDs06lwy8Nf1Ob0lYCn9m76OIk4deCeBTTak98bLyN0VVmMUU
+CFsMMonKBkyDOOA3HZYZ5cxBw+3PZLa8Vb8PJ4siub9cgO+VMhN5sLrLU9LLf7H+
+Y0s+csJy3VSpe77RY+orKjNZHN9znrJN2tHYUtvsuhzQhDddEJ14y4XbHbao1KD6
+EXoDP3ldJUoUo3wDA3eN6urbwGYD/UNYWmT0hBUGoqFwwmCGv9oFWXHE8u3h6tMV
+aeix9kmKvF9h4GRe0+sqKoK44rQsbmrVjIAzSmjTyuqjmdppEjNboPIVGh109g5m
+7n6tw8BmIk3amQ==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufpel.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufpel.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">UFPel - Universidade Federal de Pelotas</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFPel - Universidade Federal de Pelotas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFPel - Universidade Federal de Pelotas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFPel - Universidade Federal de Pelotas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufpel.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufpel.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>CTI Redes</md:SurName>
+    <md:EmailAddress>redes@ufpel.edu.br</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
deleted file mode 100644
index 0e9858df..00000000
--- a/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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 Lyon-Personnels</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAACMuAAAjLgAAAAAAAAAAAAAAAAAAAAAAABMG4wATBuMHEwbjShMG46oTBuPmEwbj/BMG4/0TBuPmEwbjqxMG40sTBuMHEwbjAAAAAAAAAAAAEwbjABMG4wATBuMZEwbjlBMG4+8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuPwEwbjlRMG4xkTBuMAEwbjABMG4wATBuMZEwbjshMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuOzEwbjGhMG4wATBuMGEwbjkxMG4/8TBuP/Ewbj/xMG4/8TBuP/EgXj/xEE4/8SBeP/EgXj/xMG4/8TBuP/Ewbj/xMG45QTBuMGEwbjShMG4+4TBuP/Ewbj/xMG4/8TBuP/Ewbj/xwP5P81Kuf/KB3m/x4S5P8TBuP/Ewbj/xMG4/8TBuPuEwbjTBMG46gTBuP/Ewbj/xMG4/8TBuP/Ewbj/xIF4/8xJuf/WlLs/1xU7P9DOen/EQTj/xIF4/8QA+P/EQTj/xAD46oTBuPkEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/OC7n/zsw6P8rIOb/Ihbl/z406P8lGeX/PTPo/ywg5v9COOnlEwbj+xMG4/8TBuP/Ewbj/xMG4/8RBOP/LiLm/3Rt7/9RSOr/bmfu/2Rc7f+OifL/fHXv/4uG8f55cu//nJfz+xMG4/sTBuP/Ewbj/xMG4/8TBuP/EgTj/ywg5v91bu//VUzr/0k/6f9PRur/ZFvt/0pA6v9GPOn+TEPq/2tk7vwTBuPkEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/MSXn/zUq5/8TBuP/EgXj/xIF4/8RBOP/EgXj/xEE4/8SBePlEwbjqBMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xEE4/8RBOP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/EwbjqRMG40oTBuPtEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj7hMG40sTBuMGEwbjkhMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG45QTBuMGEwbjABMG4xgTBuOxEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG47ITBuMZEwbjABMG4wATBuMAEwbjGBMG45ITBuPvEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj7xMG45MTBuMZEwbjABMG4wAAAAAAAAAAABMG4wATBuMHEwbjSRMG46gTBuPkEwbj/BMG4/wTBuPlEwbjqRMG40oTBuMHEwbjAAAAAAAAAAAA4AcAAMADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAADAAwAA4AcAAA==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-lyon.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">personnel</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Lyon-Personnels</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>
-					      MIIDjDCCAnQCCQCGEZBF73r8IDANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-RlIxFDASBgNVBAgMC1JIT05FLUFMUEVTMQ0wCwYDVQQHDARMWU9OMRMwEQYDVQQK
-DApDUk9VUyBMWU9OMRowGAYDVQQDDBFjYXMuY3JvdXMtbHlvbi5mcjEiMCAGCSqG
-SIb3DQEJARYTc2luZm9AY3JvdXMtbHlvbi5mcjAeFw0xNTEwMjgxNTQ1MzZaFw0y
-NTEwMjUxNTQ1MzZaMIGHMQswCQYDVQQGEwJGUjEUMBIGA1UECAwLUkhPTkUtQUxQ
-RVMxDTALBgNVBAcMBExZT04xEzARBgNVBAoMCkNST1VTIExZT04xGjAYBgNVBAMM
-EWNhcy5jcm91cy1seW9uLmZyMSIwIAYJKoZIhvcNAQkBFhNzaW5mb0Bjcm91cy1s
-eW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqvcFcCtV1M60
-Y7y/q2KPw/SxJ88NV76E0uQTJ68wwTLqgu09yqM1+LTUI6DoY8MfZQTLE/LS+amX
-AbrDNNAb2wsvFs5LnsJToy0oFOHqkxRDWuOn0bCAWW/Ug48LNriODP+bwzGZGjhG
-TWUXFPnIcFcaVXvaLfWbwnTodRoC2agtRBKBJVpk4k7yQxtCWVtgU0MLW6nTtIoW
-KagyVFcaSqgGK3rz7oWfENM574x8RFyGS5klrPoc7S6mph84XSzcRnnB2wHm0v7W
-var85+Erha9wL9V+ThcH+bskJzDQHBVK86lPeDKM+cmVMK6DcqgWnqCByO6H4DP8
-uRDugNJMAQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCmriKSevyXfwn101JFqbTj
-xxBjqstWPpNs0h9sX3Gu9E1TC8I7lEscvP3EOxwGTrS28kM0gSjYUUYiB5tN91Yh
-A9kaXAiftgZ2V0M37LWutNm0Ail/BP0qfJrHBv5Q4RixVG5f7+48RbK3wexlw0/b
-rmaYO6QZ8rEHempWBfGnwY8dBT6FlGAAXxfx5U98ol/sP/wSgKUi0+o88Syhe+4o
-aXHTe0kbLH8HKskUOpzXXuEDr9U/J1UUqX7BuHaJFrJvPxl9+Ln8f+snfqfD1lan
-uRFWPZDMY1xgKw50XyW/PKjnsWjCitM05Mem2pjkZj0nurjPOrIwlJetip5QFwfg
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names: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>
-					      MIIDjDCCAnQCCQCGEZBF73r8IDANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-RlIxFDASBgNVBAgMC1JIT05FLUFMUEVTMQ0wCwYDVQQHDARMWU9OMRMwEQYDVQQK
-DApDUk9VUyBMWU9OMRowGAYDVQQDDBFjYXMuY3JvdXMtbHlvbi5mcjEiMCAGCSqG
-SIb3DQEJARYTc2luZm9AY3JvdXMtbHlvbi5mcjAeFw0xNTEwMjgxNTQ1MzZaFw0y
-NTEwMjUxNTQ1MzZaMIGHMQswCQYDVQQGEwJGUjEUMBIGA1UECAwLUkhPTkUtQUxQ
-RVMxDTALBgNVBAcMBExZT04xEzARBgNVBAoMCkNST1VTIExZT04xGjAYBgNVBAMM
-EWNhcy5jcm91cy1seW9uLmZyMSIwIAYJKoZIhvcNAQkBFhNzaW5mb0Bjcm91cy1s
-eW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqvcFcCtV1M60
-Y7y/q2KPw/SxJ88NV76E0uQTJ68wwTLqgu09yqM1+LTUI6DoY8MfZQTLE/LS+amX
-AbrDNNAb2wsvFs5LnsJToy0oFOHqkxRDWuOn0bCAWW/Ug48LNriODP+bwzGZGjhG
-TWUXFPnIcFcaVXvaLfWbwnTodRoC2agtRBKBJVpk4k7yQxtCWVtgU0MLW6nTtIoW
-KagyVFcaSqgGK3rz7oWfENM574x8RFyGS5klrPoc7S6mph84XSzcRnnB2wHm0v7W
-var85+Erha9wL9V+ThcH+bskJzDQHBVK86lPeDKM+cmVMK6DcqgWnqCByO6H4DP8
-uRDugNJMAQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCmriKSevyXfwn101JFqbTj
-xxBjqstWPpNs0h9sX3Gu9E1TC8I7lEscvP3EOxwGTrS28kM0gSjYUUYiB5tN91Yh
-A9kaXAiftgZ2V0M37LWutNm0Ail/BP0qfJrHBv5Q4RixVG5f7+48RbK3wexlw0/b
-rmaYO6QZ8rEHempWBfGnwY8dBT6FlGAAXxfx5U98ol/sP/wSgKUi0+o88Syhe+4o
-aXHTe0kbLH8HKskUOpzXXuEDr9U/J1UUqX7BuHaJFrJvPxl9+Ln8f+snfqfD1lan
-uRFWPZDMY1xgKw50XyW/PKjnsWjCitM05Mem2pjkZj0nurjPOrIwlJetip5QFwfg
-					    </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 Lyon-Personnels</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Lyon-Personnels</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-lyon.fr</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/catalogue.clouds.geant.net-saml2-entityid.xml b/swamid-interfederations-2.0/catalogue.clouds.geant.net-saml2-entityid.xml
index d55699be..b506d3e7 100644
--- a/swamid-interfederations-2.0/catalogue.clouds.geant.net-saml2-entityid.xml
+++ b/swamid-interfederations-2.0/catalogue.clouds.geant.net-saml2-entityid.xml
@@ -35,7 +35,7 @@
     <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://catalogue.clouds.geant.net/api/login/saml/callback" index="1" isDefault="true"/>
+    <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>
diff --git a/swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml
index 93c87541..853c48f9 100644
--- a/swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml
@@ -28,6 +28,14 @@
     <md:NameIDFormat>urn:oasis:names: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/df9b663261436f0d31a332a5e17161b1"/>
   </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Clusius College</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Clusius College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">Clusius College</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Clusius College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.clusius.nl</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clusius.nl</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>SURFconext support</md:GivenName>
     <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
diff --git a/swamid-interfederations-2.0/childes.talkbank.org-shibboleth.xml b/swamid-interfederations-2.0/childes.talkbank.org-shibboleth.xml
index e5a98133..cf6b0e84 100644
--- a/swamid-interfederations-2.0/childes.talkbank.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/childes.talkbank.org-shibboleth.xml
@@ -7,7 +7,7 @@
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc: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/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
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 5fa412f1..4ac15552 100644
--- a/swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml
@@ -9,7 +9,7 @@
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml b/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
index ac927daa..b70b0e09 100644
--- a/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
+++ b/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarin.oeaw.ac.at/shibboleth">
+<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>
@@ -39,7 +39,7 @@
         <mdui:InformationURL xml:lang="en">http://acdh.oeaw.ac.at</mdui:InformationURL>
         <mdui:InformationURL xml:lang="de">http://acdh.oeaw.ac.at</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://clarin.oeaw.ac.at/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="70" width="55">https://clarin.oeaw.ac.at/sites/clarin.oeaw.ac.at/files/ccv_logo_v1b.png</mdui:Logo>
+        <mdui:Logo width="55" height="70">https://clarin.oeaw.ac.at/sites/clarin.oeaw.ac.at/files/ccv_logo_v1b.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -100,13 +100,13 @@ rI8v6OTvibpLrg==
       <md:ServiceName xml:lang="de">ACDH-AW Dienste für Digitale Geisteswissenschaften</md:ServiceName>
       <md:ServiceDescription xml:lang="en">Various services provided by the Austrian Centre for Digital Humanities of the Austrian Academy of Sciences (ACDH-AW) (primarily in the context of the CLARIN initiative).</md:ServiceDescription>
       <md:ServiceDescription xml:lang="de">Verschiedene Dienste des österreichischen Zentrums für Digitale Geisteswissenschaften der Österreichischen Akademie der Wissenschaften (ACDH-AW) (primär im Rahmen der CLARIN-Initiative).</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute isRequired="true" FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute isRequired="false" 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="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>
diff --git a/swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml b/swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml
index fef33502..23a04b4e 100644
--- a/swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml
+++ b/swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml
@@ -9,7 +9,7 @@
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/clarino.uib.no-.xml b/swamid-interfederations-2.0/clarino.uib.no-.xml
index 82c279de..41c8df75 100644
--- a/swamid-interfederations-2.0/clarino.uib.no-.xml
+++ b/swamid-interfederations-2.0/clarino.uib.no-.xml
@@ -25,10 +25,10 @@
         <mdui:Description xml:lang="de">Norwegische Forschungsinfrastruktur für Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</mdui:Description>
         <mdui:Description xml:lang="fi">Norja tutkimusinfrastruktuurin kielen tietojen ja palvelujen, jotka liittyvät CLARIN aloitetta.</mdui:Description>
         <mdui:PrivacyStatementURL xml:lang="en">http://clarino.uib.no/iness/page?page-id=privacy_policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="64" width="180">https://clarino.uib.no/images/clarino_duo-180.png</mdui:Logo>
-        <mdui:Logo height="106" width="296">https://clarino.uib.no/images/clarino_duo-296.png</mdui:Logo>
-        <mdui:Logo height="165" width="460">https://clarino.uib.no/images/clarino_duo-460.png</mdui:Logo>
-        <mdui:Logo height="231" width="740">https://clarino.uib.no/images/clarino_duo-740.png</mdui:Logo>
+        <mdui:Logo width="180" height="64">https://clarino.uib.no/images/clarino_duo-180.png</mdui:Logo>
+        <mdui:Logo width="296" height="106">https://clarino.uib.no/images/clarino_duo-296.png</mdui:Logo>
+        <mdui:Logo width="460" height="165">https://clarino.uib.no/images/clarino_duo-460.png</mdui:Logo>
+        <mdui:Logo width="740" height="231">https://clarino.uib.no/images/clarino_duo-740.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -50,12 +50,12 @@
       <md:ServiceDescription xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til CLARIN-initiativet.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="de">Norwegische Forschungsinfrastruktur für Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="fi">Norja tutkimusinfrastruktuurin kielen tietojen ja palvelujen, jotka liittyvät CLARIN aloitetta.</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="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: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 Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o" 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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/clueless.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/clueless.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
index 33236e0f..f625e373 100644
--- a/swamid-interfederations-2.0/clueless.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/clueless.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
@@ -16,7 +16,7 @@
         <mdui:Description xml:lang="fr">Fournisseur d'Identité pour employés de la Fondation RESTENA</mdui:Description>
         <mdui:Description xml:lang="de">Identitätsprovider für Mitarbeiter der Stiftung RESTENA</mdui:Description>
         <mdui:Keywords xml:lang="en">RESTENA staff login</mdui:Keywords>
-        <mdui:Logo height="100" width="78" xml:lang="en">http://clueless.restena.lu/restena.png</mdui:Logo>
+        <mdui:Logo width="78" height="100" xml:lang="en">http://clueless.restena.lu/restena.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:IPHint>158.64.0.0/16</mdui:IPHint>
diff --git a/swamid-interfederations-2.0/compass.astm.org-sp-shibboleth.xml b/swamid-interfederations-2.0/compass.astm.org-sp-shibboleth.xml
new file mode 100644
index 00000000..e9287f93
--- /dev/null
+++ b/swamid-interfederations-2.0/compass.astm.org-sp-shibboleth.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://compass.astm.org/sp/shibboleth">
+  <!--
+		This is a Shibboleth SP for the American Society for Testing and Materials.
+	-->
+  <Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-28T14:26:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <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://compassstaging.astm.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://compassstaging.astm.org/Shibboleth.sso/Login" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDHzCCAgegAwIBAgIJAMhe0MCQ+T2jMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEGNvbXBhc3MuYXN0bS5vcmcwHhcNMTYwMTE0MTYxNjIwWhcNMjYwMTExMTYx
+						NjIwWjAbMRkwFwYDVQQDExBjb21wYXNzLmFzdG0ub3JnMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEA6tDVWkS4w34gUzvH7IJRZ8879W1SI8p7OyiminkH
+						kz1Nghy+C7nJeb64EOxs8+TQpNNlHz/MyH5LqpkQTWuUSXBzRRZTKLDWIzUcp1UL
+						OsgX/MNlQBRz5Yuek9N9JQ7iNEwyIE0cgDRyKO/S6M62SVNofkudHlt4G353PA72
+						XGqy24YQ07+yWNHuLqx1zzb0fMaoiqyRsQhZ+xI+/w8h5gHXEg6b+i8LELSNxu5W
+						FFWIkM0FqIPh4NARtZZrayL8CInC4fxv2V2bmmYffhuP72oyl70Km1kAursmfxc0
+						p+fS7o5fq2rb55RJO6u4dsyLphC8xAIi0HMU5l5wwcSiCwIDAQABo2YwZDBDBgNV
+						HREEPDA6ghBjb21wYXNzLmFzdG0ub3JnhiZodHRwczovL2NvbXBhc3MuYXN0bS5v
+						cmcvc3Avc2hpYmJvbGV0aDAdBgNVHQ4EFgQUpOdwAN0qg5yMCoLFQmKt+52m/XAw
+						DQYJKoZIhvcNAQEFBQADggEBAAbxOUATQw/kc9gZ82PFTbIks/Y5Z4mjH4PGo2aq
+						9uxx4Y4XYyfIUSLxLNCPZj9Oz8nMaPgvPW7ozJcoka89p/K+viWXYmaPRCeaq22/
+						Yu6NhWsrCfXUlKnId7cPdcW6m6oe5EDrAhxu2W9UacUqnZ9HCMfSIZJSWreX5dDB
+						M8qY0r5C7XjqrxXnx+Nl5Z1qtVPvd3m8CLgbxBm/rpHAsRWANnNgbXDV1zYGETvJ
+						QxnGwgOH9mj1zQDSgMGJr7UytghRrc2mm9HdWlBPjUYQqG31YdDIQ/c2Cn9ngO1Q
+						SWilnRkPC0Ss7JYviDGUP9JLpx8dhd8F4ZpGII4vF/tKWPk=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://compassstaging.astm.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://compassstaging.astm.org/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://compassstaging.astm.org/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://compassstaging.astm.org/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://compassstaging.astm.org/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://compassstaging.astm.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://compassstaging.astm.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://compassstaging.astm.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://compassstaging.astm.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://compassstaging.astm.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://compassstaging.astm.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">American Society for Testing and Materials</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">ASTM Compass</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.astm.org/ABOUT/overview.html</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Micronexx Support</GivenName>
+    <EmailAddress>mailto:support@micronexx.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Micronexx Support</GivenName>
+    <EmailAddress>mailto:support@micronexx.com</EmailAddress>
+  </ContactPerson>
+</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
index 8d6a8ba4..609ea39b 100644
--- a/swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml
+++ b/swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml
@@ -5,7 +5,7 @@
       <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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</saml:AttributeValue>
@@ -87,13 +87,13 @@ H/AVOR5U++JOt28OOfoi7mtxOFPxkge3AooWLNFOEOGMSF78BG8NCrT0l59OnAtN
     <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:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.16.840.1.113730.3.1.241"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml b/swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml
index 1ea24c40..63b29667 100644
--- a/swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml
+++ b/swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml
@@ -5,7 +5,7 @@
       <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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
       </saml:Attribute>
@@ -91,12 +91,12 @@ bUs=
     <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:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/cpauth.icos-cp.eu-saml-cpauth.xml b/swamid-interfederations-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
index 4eac467b..7170d639 100644
--- a/swamid-interfederations-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
+++ b/swamid-interfederations-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
@@ -21,7 +21,7 @@
     <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
diff --git a/swamid-interfederations-2.0/crowd.nordu.net-shibboleth.xml b/swamid-interfederations-2.0/crowd.nordu.net-shibboleth.xml
index 398760c0..070bdca4 100644
--- a/swamid-interfederations-2.0/crowd.nordu.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/crowd.nordu.net-shibboleth.xml
@@ -5,7 +5,7 @@
       <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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
       </saml:Attribute>
@@ -93,11 +93,11 @@ Neib9lWMnEYRIynoqQE3UXYnb3GDinEg/soKH73QAq0dyjcfuk30FA==
     <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:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/csus.infoready4.com-shibboleth.xml b/swamid-interfederations-2.0/csus.infoready4.com-shibboleth.xml
new file mode 100644
index 00000000..d9f01ad4
--- /dev/null
+++ b/swamid-interfederations-2.0/csus.infoready4.com-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://csus.infoready4.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <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://csus.infoready4.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">InfoReady Review - Sacramento State</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIC6zCCAdOgAwIBAgIJAOO9wmxE2PCSMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDGluZm9yZHl3aW4wMjAeFw0xMzEwMjkwNjE0NDlaFw0yMzEwMjcwNjE0NDla
+MBcxFTATBgNVBAMTDGluZm9yZHl3aW4wMjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMpdE35LzF2eEaAhLfxtotv6XhMXfkOMbugHq8xk5rhyx7RKS+Ku
+t9wW8Mv2rG7NAJw+8167dP6N2RQKpRBn17FIOhm/cuSNtiTBJtA9QiTEkyN5D1ma
+ykJjlD95ymo0XdRDWwz/6IP5v+d95BlfbnlkswWOGOMLxCtaWCSZQ00RJFDKudL5
+IrK+2A1KwF4O+DxqivhdLsd/yA+IjX1efYnT7MPsd7Yyh5wKXKkGbKEg9yAW65Dt
+x2xbBCjDT2PCBhJ4ZuRfUv8whBCT2qgH6+pQ5JBN9ZDz1iGDFp8XfQ27UtzlFdBc
+cjvWmtOh/V35fBXl5LIbJdU/ypJMBwehxbcCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+aW5mb3JkeXdpbjAyMB0GA1UdDgQWBBQTyklRhSLuL0VcI0Nv4tQhZYqHITANBgkq
+hkiG9w0BAQUFAAOCAQEAJyNYKdKAFdp7xvqnjszw+AF3dYl3HQKe5bC0M+gu7G+2
+hJL2D70cFCXXi2bNcdyLsFVPiecMo69QinOP3kqCPNL7S5pSjm48T9bTiRr4WNy1
+hkxJ7nCV++z696YqbE7WYec9LEpcNDnDnmDfQOxvxzdtpIyM3Egw+koKEZu13ebw
+zAs2xgBj3V5YWmzS7nk1wPPJBKpr+9W5xixEGfaKfrrQXayP/LVyN+u/3BjZCZfE
+bfqmalH+rjpJ7ZCck4CQFxCvnLhwl+L5DEuEFXmgTzk7EDb65no+rXaZQd3/IEre
+sazovBHNw8FPYGiOCi2757flvBsb6gW+FbN0SPmtSQ==
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://csus.infoready4.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://csus.infoready4.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://csusb.infoready4.com/Shibboleth.sso/SLO/POST"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://csus.infoready4.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://csus.infoready4.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://csus.infoready4.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://csus.infoready4.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">InfoReady Review - Sacramento State</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">InfoReady Corp</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">InfoReady Corp</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.infoready4.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John Testa</md:GivenName>
+    <md:EmailAddress>jtesta@inforeadycorp.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.clarin.nl-shibboleth.xml b/swamid-interfederations-2.0/dev.clarin.nl-shibboleth.xml
index 377b8b60..2c82ff22 100644
--- a/swamid-interfederations-2.0/dev.clarin.nl-shibboleth.xml
+++ b/swamid-interfederations-2.0/dev.clarin.nl-shibboleth.xml
@@ -8,7 +8,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0: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://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/dev.screeningshorts.org.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.screeningshorts.org.uk-shibboleth.xml
new file mode 100644
index 00000000..92d74d27
--- /dev/null
+++ b/swamid-interfederations-2.0/dev.screeningshorts.org.uk-shibboleth.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.screeningshorts.org.uk/shibboleth">
+  <!--
+		This is a 'Screening Shorts' SP for Scottish Film Ltd.
+	-->
+  <Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-29T10:56:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <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://dev.screeningshorts.org.uk/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://dev.screeningshorts.org.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Screening Shorts</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Screening Shorts is a range of in-depth tutorials exploring moving image literacy in the classroom.</mdui:Description>
+        <mdui:Logo height="116" width="350">https://dev.screeningshorts.org.uk/sites/default/files/UK-Fed-SS.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC4jCCAcqgAwIBAgIJALarzn+jqr9CMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+						BAMTCWxvY2FsaG9zdDAeFw0xNjAzMjgwOTExNDJaFw0yNjAzMjYwOTExNDJaMBQx
+						EjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAOjB6lQEcwCM+Gvt15EcUvUf2I4dCCXXB4tcrQPbyyUHVYk3igrPnBfU1RT/
+						lE0/tC4/7hSdQ39dnbcWXFrpqhyYq4a3v9QYx+xQ+tUuAD3rkPdXhUBOv3MVCzeR
+						XlITZj349NJ7VaPDQxoDayhdcAX+UqFwEwgYpOKqNvBb6dgsdrxQt74tOy1p1doA
+						fKIDVb9ExbrdqzNmYDKNZhU/iGW2Ur3WMMA+iAdL/pwH0+1s68B9Oickxz0HF40C
+						JvQdJ/7WzvYt1f4aD6DDNShGl3UZwRncV2+DquunrQKizyGoiHFk03DDfqIKC0nR
+						NmruPdIpVH2qUIJHaq6qtvrabYMCAwEAAaM3MDUwFAYDVR0RBA0wC4IJbG9jYWxo
+						b3N0MB0GA1UdDgQWBBR6xQ1tKW/YVzxw5Psjaz4RJRNlVDANBgkqhkiG9w0BAQUF
+						AAOCAQEAAqNC2uJCEei1f7QGqbz48boiR/NLPQFPUouEH2V8LWM+cMEiq5H9xLv0
+						ZcegJ9+8SVA7vXWd+RKKuJWF9RQAKy9dwghYWGEnWd5cdizuBW45ZczaFt6QYFn/
+						X9YwEescjTK4HUIbo64IMHOhMSrMIBNP0FzAQYYfGs1XpKfrQtP3xwZa3m32KFR3
+						gjb4xlOwNDKDbEsXh/i21jIeGPHAprrC1s4yS81eRy0tvY3+gOhbt1mIiUy0/IH/
+						mSxnCIVkqMpyEO2lf4HSeCevpx719zpcN2QvzVpwJyszsWk+8+Uzwchd2s0xmx3P
+						LPak+NOTGk0WQA1uUH8HNDvcehloGg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.screeningshorts.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.screeningshorts.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.screeningshorts.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.screeningshorts.org.uk/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.screeningshorts.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.screeningshorts.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.screeningshorts.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.screeningshorts.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.screeningshorts.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.screeningshorts.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.screeningshorts.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Scottish Film Ltd</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Screening Shorts</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://dev.screeningshorts.org.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Paolo</GivenName>
+    <SurName>Ciarrocca</SurName>
+    <EmailAddress>mailto:web@scottishfilm.scot</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Paolo</GivenName>
+    <SurName>Ciarrocca</SurName>
+    <EmailAddress>mailto:web@scottishfilm.scot</EmailAddress>
+  </ContactPerson>
+</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
deleted file mode 100644
index da7fa6e1..00000000
--- a/swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dl.acm.org/oa/metadata">
-  <!--
-		This is an OpenAthens 2 SP for Association for Computing Machinery, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <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>
-    </KeyDescriptor>
-    <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>
-    </KeyDescriptor>
-    <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"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dl.acm.org/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dl.acm.org/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dl.acm.org/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Association for Computing Machinery, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Association For Computing Machinery: ACM Digital Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.acm.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Asad</GivenName>
-    <SurName>Ali</SurName>
-    <EmailAddress>mailto:ali@acm.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>Greenberg</SurName>
-    <EmailAddress>mailto:greenberg@acm.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/drive.asnet.am-shibboleth.xml b/swamid-interfederations-2.0/drive.asnet.am-shibboleth.xml
index 76446101..b3d5467b 100644
--- a/swamid-interfederations-2.0/drive.asnet.am-shibboleth.xml
+++ b/swamid-interfederations-2.0/drive.asnet.am-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://drive.asnet.am/shibboleth">
+<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://drive.asnet.am/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.asnet.am" registrationInstant="2015-08-22T12:46:47Z"/>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..48c05039
--- /dev/null
+++ b/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ed.unidesk.ac.uk/tas/public/login/verify">
+  <!--
+		This is a "public" TOPdesk SP for the University of Edinburgh.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T08:56:17Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDrzCCApegAwIBAgIJAMVROTQuFXoxMA0GCSqGSIb3DQEBCwUAMEMxGTAXBgNV
+						BAMTEGVkLnVuaWRlc2suYWMudWsxGTAXBgNVBAoTEGVkLnVuaWRlc2suYWMudWsx
+						CzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyNTc1MFoXDTI2MDMzMDEyNTc1MFowQzEZ
+						MBcGA1UEAxMQZWQudW5pZGVzay5hYy51azEZMBcGA1UEChMQZWQudW5pZGVzay5h
+						Yy51azELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDBSIaEqZsBLHTmdv2pTau02z5iX2M+Y/I7rY3SBWy/is2bfuBuEzPS58oPMeHi
+						wFjfr8CAPQ2bQ32GK3lbvQzVAZqwabe+s+hcsdLFSmm26GxrmgbiL/U1Inx32gHL
+						8Y494i1DNURJl7ImhY1LtSQBg81C/7uOf1P6pDoWQcUSooN+I0WLKVf4S5JGU4WW
+						7uCUGFTVIEGFwveU4cpE/B1i6kuu1zq1n3X0zRyFG1Uu34fzujM8+0rlh/w9yl67
+						hq8qAHL/9j0909WXeaOXj/TPYSRISQCnq2biEmzOb09Jb/2/5gRFUSRVxh3fm5HT
+						P1YDRav07OAGGhSmC75JTJvJAgMBAAGjgaUwgaIwHQYDVR0OBBYEFPHFACKjBapO
+						RoiScm580WU4EzPbMHMGA1UdIwRsMGqAFPHFACKjBapORoiScm580WU4EzPboUek
+						RTBDMRkwFwYDVQQDExBlZC51bmlkZXNrLmFjLnVrMRkwFwYDVQQKExBlZC51bmlk
+						ZXNrLmFjLnVrMQswCQYDVQQGEwJVS4IJAMVROTQuFXoxMAwGA1UdEwQFMAMBAf8w
+						DQYJKoZIhvcNAQELBQADggEBAFOywZTwbtNhO4YAicWZ1MLcJoZnD3diuQhccHKO
+						zaWZJju/OxbF4rurP3BH0rqJxruXwksD3bk45PKKTb6jLlBkRsqaTrSRL/Z/M6Hs
+						NWy1pBAjP4EMEB+2Tmnikqx/e6BdfhogcPAwFAtup6u9H+kFY/tzprNH20q+07Gk
+						yFKCJJwKZac1TFHLGA6PIzVFOuNqyFQGFqxVew/oL94UCJTTwtLTTuIPvpZaCTo+
+						IyjlIMVigvenyr68jnkrJCgsberkaoPyxP00uK4QvdA0E9by1SvwNVy420Kvvb6+
+						x/fFAXseVm8uRjmuM2HiffZhqgSKm1X1S4+nJ6HXYjGo8+g=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDrzCCApegAwIBAgIJAMVROTQuFXoxMA0GCSqGSIb3DQEBCwUAMEMxGTAXBgNV
+						BAMTEGVkLnVuaWRlc2suYWMudWsxGTAXBgNVBAoTEGVkLnVuaWRlc2suYWMudWsx
+						CzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyNTc1MFoXDTI2MDMzMDEyNTc1MFowQzEZ
+						MBcGA1UEAxMQZWQudW5pZGVzay5hYy51azEZMBcGA1UEChMQZWQudW5pZGVzay5h
+						Yy51azELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDBSIaEqZsBLHTmdv2pTau02z5iX2M+Y/I7rY3SBWy/is2bfuBuEzPS58oPMeHi
+						wFjfr8CAPQ2bQ32GK3lbvQzVAZqwabe+s+hcsdLFSmm26GxrmgbiL/U1Inx32gHL
+						8Y494i1DNURJl7ImhY1LtSQBg81C/7uOf1P6pDoWQcUSooN+I0WLKVf4S5JGU4WW
+						7uCUGFTVIEGFwveU4cpE/B1i6kuu1zq1n3X0zRyFG1Uu34fzujM8+0rlh/w9yl67
+						hq8qAHL/9j0909WXeaOXj/TPYSRISQCnq2biEmzOb09Jb/2/5gRFUSRVxh3fm5HT
+						P1YDRav07OAGGhSmC75JTJvJAgMBAAGjgaUwgaIwHQYDVR0OBBYEFPHFACKjBapO
+						RoiScm580WU4EzPbMHMGA1UdIwRsMGqAFPHFACKjBapORoiScm580WU4EzPboUek
+						RTBDMRkwFwYDVQQDExBlZC51bmlkZXNrLmFjLnVrMRkwFwYDVQQKExBlZC51bmlk
+						ZXNrLmFjLnVrMQswCQYDVQQGEwJVS4IJAMVROTQuFXoxMAwGA1UdEwQFMAMBAf8w
+						DQYJKoZIhvcNAQELBQADggEBAFOywZTwbtNhO4YAicWZ1MLcJoZnD3diuQhccHKO
+						zaWZJju/OxbF4rurP3BH0rqJxruXwksD3bk45PKKTb6jLlBkRsqaTrSRL/Z/M6Hs
+						NWy1pBAjP4EMEB+2Tmnikqx/e6BdfhogcPAwFAtup6u9H+kFY/tzprNH20q+07Gk
+						yFKCJJwKZac1TFHLGA6PIzVFOuNqyFQGFqxVew/oL94UCJTTwtLTTuIPvpZaCTo+
+						IyjlIMVigvenyr68jnkrJCgsberkaoPyxP00uK4QvdA0E9by1SvwNVy420Kvvb6+
+						x/fFAXseVm8uRjmuM2HiffZhqgSKm1X1S4+nJ6HXYjGo8+g=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ed.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Unidesk - University of Edinburgh</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IS Apps Technology Management</GivenName>
+    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..c931a7d9
--- /dev/null
+++ b/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ed.unidesk.ac.uk/tas/secure/login/verify">
+  <!--
+		This is a "secure" TOPDesk SP for the University of Edinburgh.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T08:58:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDrzCCApegAwIBAgIJAKj/uVWYBQrKMA0GCSqGSIb3DQEBCwUAMEMxGTAXBgNV
+						BAMTEGVkLnVuaWRlc2suYWMudWsxGTAXBgNVBAoTEGVkLnVuaWRlc2suYWMudWsx
+						CzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyNTc1M1oXDTI2MDMzMDEyNTc1M1owQzEZ
+						MBcGA1UEAxMQZWQudW5pZGVzay5hYy51azEZMBcGA1UEChMQZWQudW5pZGVzay5h
+						Yy51azELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCqrCvKLV1axFbGxCwT8E+BbMcGKXuG180hmZPwSXsrrAWg6ErYjOORQ2UCw2Xp
+						tVam+WiuRdpxHrtoT7tCM2VHrKcMleWhXPvSsoH6EZ3kzFVCgojnhCg6IiCpoG/7
+						n32HuoD8kWEKyKTrPeOriDz2LIgdMI2EWFFgLK2r9vBo8Ko7ANiGzgymnRyQSQjQ
+						gaHAgUowjFBxjH/0MOFut4rrCgA7o/7w46eBv5JpAvnrCBikfbiguQf36WACA1Qz
+						307fSVQL7R60/KULWGmRoXjWWPSgCtyspnP8ILG/v+HlQag5ExDKcx36flIvwmp2
+						n3MsNNYVrXFt7Nn08Gec4ka/AgMBAAGjgaUwgaIwHQYDVR0OBBYEFOfVReESELZa
+						C7UqM5LhyvTG1uEDMHMGA1UdIwRsMGqAFOfVReESELZaC7UqM5LhyvTG1uEDoUek
+						RTBDMRkwFwYDVQQDExBlZC51bmlkZXNrLmFjLnVrMRkwFwYDVQQKExBlZC51bmlk
+						ZXNrLmFjLnVrMQswCQYDVQQGEwJVS4IJAKj/uVWYBQrKMAwGA1UdEwQFMAMBAf8w
+						DQYJKoZIhvcNAQELBQADggEBAHGzM2Pw3YkZy8lZrKHzXhTOM74v9hMiBJgQw9/d
+						b/NV7HdY3Qd0DuQfM1jlCiOzfh/tIF6Fh45NbuYcGZ5Aw6NeWg1H/Yd9OEDxdEnR
+						ChRBqMu3LFuaUk+88gnyCGg8hS2R00RNHIzYlXlh+JgWnE+/2q5tGFQ8CfMl95XG
+						50w/eWY19/pfqosdNZyutk/tXwzHPcrI+n8iW2JkUe9Gasfg7JvQeCNpoF2erM4v
+						EvEue9SE6lLcP4L5gVPVo0ibvIIWUPIYVXjbKCDZjBgOWafwklfYdRbclNyPSSVq
+						vzrXt+sPz4+CBoOXgthUcvZwFNzMBoIm2wWZdJn4RI38rHA=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDrzCCApegAwIBAgIJAKj/uVWYBQrKMA0GCSqGSIb3DQEBCwUAMEMxGTAXBgNV
+						BAMTEGVkLnVuaWRlc2suYWMudWsxGTAXBgNVBAoTEGVkLnVuaWRlc2suYWMudWsx
+						CzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyNTc1M1oXDTI2MDMzMDEyNTc1M1owQzEZ
+						MBcGA1UEAxMQZWQudW5pZGVzay5hYy51azEZMBcGA1UEChMQZWQudW5pZGVzay5h
+						Yy51azELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCqrCvKLV1axFbGxCwT8E+BbMcGKXuG180hmZPwSXsrrAWg6ErYjOORQ2UCw2Xp
+						tVam+WiuRdpxHrtoT7tCM2VHrKcMleWhXPvSsoH6EZ3kzFVCgojnhCg6IiCpoG/7
+						n32HuoD8kWEKyKTrPeOriDz2LIgdMI2EWFFgLK2r9vBo8Ko7ANiGzgymnRyQSQjQ
+						gaHAgUowjFBxjH/0MOFut4rrCgA7o/7w46eBv5JpAvnrCBikfbiguQf36WACA1Qz
+						307fSVQL7R60/KULWGmRoXjWWPSgCtyspnP8ILG/v+HlQag5ExDKcx36flIvwmp2
+						n3MsNNYVrXFt7Nn08Gec4ka/AgMBAAGjgaUwgaIwHQYDVR0OBBYEFOfVReESELZa
+						C7UqM5LhyvTG1uEDMHMGA1UdIwRsMGqAFOfVReESELZaC7UqM5LhyvTG1uEDoUek
+						RTBDMRkwFwYDVQQDExBlZC51bmlkZXNrLmFjLnVrMRkwFwYDVQQKExBlZC51bmlk
+						ZXNrLmFjLnVrMQswCQYDVQQGEwJVS4IJAKj/uVWYBQrKMAwGA1UdEwQFMAMBAf8w
+						DQYJKoZIhvcNAQELBQADggEBAHGzM2Pw3YkZy8lZrKHzXhTOM74v9hMiBJgQw9/d
+						b/NV7HdY3Qd0DuQfM1jlCiOzfh/tIF6Fh45NbuYcGZ5Aw6NeWg1H/Yd9OEDxdEnR
+						ChRBqMu3LFuaUk+88gnyCGg8hS2R00RNHIzYlXlh+JgWnE+/2q5tGFQ8CfMl95XG
+						50w/eWY19/pfqosdNZyutk/tXwzHPcrI+n8iW2JkUe9Gasfg7JvQeCNpoF2erM4v
+						EvEue9SE6lLcP4L5gVPVo0ibvIIWUPIYVXjbKCDZjBgOWafwklfYdRbclNyPSSVq
+						vzrXt+sPz4+CBoOXgthUcvZwFNzMBoIm2wWZdJn4RI38rHA=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ed.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Unidesk - University of Edinburgh</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IS Apps Technology Management</GivenName>
+    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml b/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml
index 60a8580c..2bdbdee6 100644
--- a/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml
+++ b/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edugate.heanet.ie/shibboleth">
+<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" 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">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.heanet.ie/services/identity-access/edugate#join</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/eduid.jamu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/eduid.jamu.cz-idp-shibboleth.xml
deleted file mode 100644
index beaa26a8..00000000
--- a/swamid-interfederations-2.0/eduid.jamu.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eduid.jamu.cz/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-11-08T10:04:45Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jamu.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Janacek Academy of Music and Performing Arts in Brno</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Janáčkova akademie múzických umění v Brně</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students of the Janacek Academy of Music and Performing Arts in Brno</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Janáčkovy akademie múzických umění v Brně</mdui:Description>
-        <mdui:Logo height="113" width="111">https://www.jamu.cz/graphics/janacek.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>
-MIIFqDCCBJCgAwIBAgIQCBZxmLU34g304oOobnlcojANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNTAzMTMwMDAwMDBaFw0xODAzMTIyMzU5NTlaMDsxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNZWR1aWQuamFtdS5j
-ejCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5hgfGmKJOxvo77wH72
-QCm33kBmqxoaP3vR+8mmfMKy2an5OfGLdurbiaECmgwBxCgyknaodqRU7uXVBwki
-aIMNsKvv26KcAIekFKe/GWwIgYVnFsncLZDbGTy+vI0SKthLdapJtiL7xzxJgrx4
-ymiMHeubEuOC6Cgfpi4mpUzPPMff2O21F8B5PCZeRT0N2PzucQJhndW1lqUZoDM5
-JBKWjnTm+uQv+ogbB1Pyv+eFPohhvJLa6nNYVVPeMCMzDFZMtlfGwddfV6/SQqss
-ye+fivGL4mNZw1orP0c5YCZIYFeL5heg5kvfNO27RpKYoR1jysvtx4kj61zjKdwx
-pTHcFVa0IrUgk1B+NVUoEqcmFYfqb+v2k88WZmwbRpgS5oqHB8ghULejGDVdPeE2
-EKbO8NlUf79+e/XdkV0iC+BXKCtslWV6KT1j/rkPFDg3gln+kuOx0VWVZNsDbp7u
-o7YyxAo6nnZr/BsG91KzLmq0x7b+2PhQKU+y1zXDZRXFw3NirwSho55VCT2ojhMM
-bVU2yPFKBwankWvurAUwdYRnMNivUxlFtIZPwd6puZC/h/UdFnOKhrcC0SFp63Cj
-kVYc4aDeyk5eK3DczVGsHLLcNmQxA8m7pkBguBvJ++SLEiW5oEVRaXKr3PAy7b36
-Z86HO5jX6vcOslx3q+oiBwNTAgMBAAGjggF9MIIBeTAfBgNVHSMEGDAWgBRb0Ioc
-mjJb4LXdllQb4YYosP22vTAdBgNVHQ4EFgQUUlDt3t01Naw+DK2fBg+WZHWpYpIw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJF
-TkFTU0xDQTIuY3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGG
-GWh0dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wLAYDVR0RBCUwI4INZWR1aWQuamFt
-dS5jeoISc2hpYmJvbGV0aC5qYW11LmN6MA0GCSqGSIb3DQEBCwUAA4IBAQA3OyhB
-6PSVkoWQp37t1AcSR4irdkjT5+9gpHRortS6m1ydhcdFxcB/BW+85/yvWgpHxBnb
-t9g5b5fa0jyl6sp0M2VeSTdCb3uelqOnapBiIagdR7wyagxfBCbpdVqD1UZX5vFQ
-g4C0mjiaSQd9Ksvo6L9NMCtcameYBuxtUKi/Of88dRZPX/WQRTHYYsq4gTmRekgL
-FoJ7e0uBbvvNNVEwiriba9C1hreED5k8Tdlun0dk3QNCZP4uEOM3kng/Hy/ZDKIf
-DdDexXrGQ9wBME/kfcV3Rb4KluRSh3UhTVSXGgOjQ0f6WlEBO+NMdsYH+kDe1YDw
-yASlKAcsuc4JfDB8
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://eduid.jamu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eduid.jamu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eduid.jamu.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduid.jamu.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eduid.jamu.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://eduid.jamu.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduid.jamu.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eduid.jamu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eduid.jamu.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">jamu.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFqDCCBJCgAwIBAgIQCBZxmLU34g304oOobnlcojANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNTAzMTMwMDAwMDBaFw0xODAzMTIyMzU5NTlaMDsxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNZWR1aWQuamFtdS5j
-ejCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5hgfGmKJOxvo77wH72
-QCm33kBmqxoaP3vR+8mmfMKy2an5OfGLdurbiaECmgwBxCgyknaodqRU7uXVBwki
-aIMNsKvv26KcAIekFKe/GWwIgYVnFsncLZDbGTy+vI0SKthLdapJtiL7xzxJgrx4
-ymiMHeubEuOC6Cgfpi4mpUzPPMff2O21F8B5PCZeRT0N2PzucQJhndW1lqUZoDM5
-JBKWjnTm+uQv+ogbB1Pyv+eFPohhvJLa6nNYVVPeMCMzDFZMtlfGwddfV6/SQqss
-ye+fivGL4mNZw1orP0c5YCZIYFeL5heg5kvfNO27RpKYoR1jysvtx4kj61zjKdwx
-pTHcFVa0IrUgk1B+NVUoEqcmFYfqb+v2k88WZmwbRpgS5oqHB8ghULejGDVdPeE2
-EKbO8NlUf79+e/XdkV0iC+BXKCtslWV6KT1j/rkPFDg3gln+kuOx0VWVZNsDbp7u
-o7YyxAo6nnZr/BsG91KzLmq0x7b+2PhQKU+y1zXDZRXFw3NirwSho55VCT2ojhMM
-bVU2yPFKBwankWvurAUwdYRnMNivUxlFtIZPwd6puZC/h/UdFnOKhrcC0SFp63Cj
-kVYc4aDeyk5eK3DczVGsHLLcNmQxA8m7pkBguBvJ++SLEiW5oEVRaXKr3PAy7b36
-Z86HO5jX6vcOslx3q+oiBwNTAgMBAAGjggF9MIIBeTAfBgNVHSMEGDAWgBRb0Ioc
-mjJb4LXdllQb4YYosP22vTAdBgNVHQ4EFgQUUlDt3t01Naw+DK2fBg+WZHWpYpIw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJF
-TkFTU0xDQTIuY3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGG
-GWh0dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wLAYDVR0RBCUwI4INZWR1aWQuamFt
-dS5jeoISc2hpYmJvbGV0aC5qYW11LmN6MA0GCSqGSIb3DQEBCwUAA4IBAQA3OyhB
-6PSVkoWQp37t1AcSR4irdkjT5+9gpHRortS6m1ydhcdFxcB/BW+85/yvWgpHxBnb
-t9g5b5fa0jyl6sp0M2VeSTdCb3uelqOnapBiIagdR7wyagxfBCbpdVqD1UZX5vFQ
-g4C0mjiaSQd9Ksvo6L9NMCtcameYBuxtUKi/Of88dRZPX/WQRTHYYsq4gTmRekgL
-FoJ7e0uBbvvNNVEwiriba9C1hreED5k8Tdlun0dk3QNCZP4uEOM3kng/Hy/ZDKIf
-DdDexXrGQ9wBME/kfcV3Rb4KluRSh3UhTVSXGgOjQ0f6WlEBO+NMdsYH+kDe1YDw
-yASlKAcsuc4JfDB8
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://eduid.jamu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eduid.jamu.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">Janacek Academy of Music and Performing Arts in Brno</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Janacek Academy of Music and Performing Arts in Brno</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Janáčkova akademie múzických umění v Brně</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://english.jamu.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.jamu.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jaroslav</md:GivenName>
-    <md:SurName>Meixner</md:SurName>
-    <md:EmailAddress>meixner@jamu.cz</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
deleted file mode 100644
index 28c343b8..00000000
--- a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edustore.adeptscience.co.uk/oa/metadata">
-  <!--
-		This is a "UK Education Store" OpenAthens SP for Adept Scientific plc.
-	-->
-  <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>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <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>
-    </Extensions>
-    <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>
-    </KeyDescriptor>
-    <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>
-    </KeyDescriptor>
-    <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"/>
-    <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"/>
-    <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"/>
-    <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"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Adept Scientific plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Adept Scientific UK Education Store</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.adeptscience.co.uk/about/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mark</GivenName>
-    <SurName>Ridley</SurName>
-    <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Ridley</SurName>
-    <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
-  </ContactPerson>
-</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
deleted file mode 100644
index 69cdb940..00000000
--- a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edustore.adeptscience.co.uk/oasp">
-  <!--
-		This is an OpenAthens SP for Adept Scientific plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <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>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edustore.adeptscience.co.uk/a4e/auth/rcv" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edustore5.adeptscience.co.uk/a4e/auth/rcv" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore.adeptscience.co.uk/a4e/auth/rcv" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore5.adeptscience.co.uk/a4e/auth/rcv" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Adept Scientific plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Adept Scientific plc: Adept4Education</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.adeptscience.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mark</GivenName>
-    <SurName>Ridley</SurName>
-    <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Ridley</SurName>
-    <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ekrksso.keeleressursid.ee-simplesaml-module.php-saml-sp-metadata.php-ekrk-sp.xml b/swamid-interfederations-2.0/ekrksso.keeleressursid.ee-simplesaml-module.php-saml-sp-metadata.php-ekrk-sp.xml
index 6e2b173d..dcccae85 100644
--- a/swamid-interfederations-2.0/ekrksso.keeleressursid.ee-simplesaml-module.php-saml-sp-metadata.php-ekrk-sp.xml
+++ b/swamid-interfederations-2.0/ekrksso.keeleressursid.ee-simplesaml-module.php-saml-sp-metadata.php-ekrk-sp.xml
@@ -9,7 +9,7 @@
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/elearning.asnet.am-shibboleth.xml b/swamid-interfederations-2.0/elearning.asnet.am-shibboleth.xml
index 01719d0b..6d89e60c 100644
--- a/swamid-interfederations-2.0/elearning.asnet.am-shibboleth.xml
+++ b/swamid-interfederations-2.0/elearning.asnet.am-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elearning.asnet.am/shibboleth">
+<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elearning.asnet.am/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.asnet.am" registrationInstant="2015-08-22T12:52:43Z"/>
   </md:Extensions>
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
index c9adcdbd..432dfe28 100644
--- a/swamid-interfederations-2.0/elixir.mf.uni-lj.si-20140918.xml
+++ b/swamid-interfederations-2.0/elixir.mf.uni-lj.si-20140918.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:algsupport="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:disco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:req="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elixir.mf.uni-lj.si/20140918">
+<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"/>
diff --git a/swamid-interfederations-2.0/elixir.mf.uni-lj.si-sp-201506181025.xml b/swamid-interfederations-2.0/elixir.mf.uni-lj.si-sp-201506181025.xml
index ae125e4d..fe2c0e77 100644
--- a/swamid-interfederations-2.0/elixir.mf.uni-lj.si-sp-201506181025.xml
+++ b/swamid-interfederations-2.0/elixir.mf.uni-lj.si-sp-201506181025.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:algsupport="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:disco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:req="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elixir.mf.uni-lj.si/sp/201506181025">
+<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/sp/201506181025">
   <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"/>
diff --git a/swamid-interfederations-2.0/elixir.mf.uni-lj.si-sp-20150622.xml b/swamid-interfederations-2.0/elixir.mf.uni-lj.si-sp-20150622.xml
index 062fca98..83c27f7b 100644
--- a/swamid-interfederations-2.0/elixir.mf.uni-lj.si-sp-20150622.xml
+++ b/swamid-interfederations-2.0/elixir.mf.uni-lj.si-sp-20150622.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:algsupport="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:disco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:req="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elixir.mf.uni-lj.si/sp/20150622">
+<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/sp/20150622">
   <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"/>
diff --git a/swamid-interfederations-2.0/engine.eduteams.org-authentication-sp-metadata.xml b/swamid-interfederations-2.0/engine.eduteams.org-authentication-sp-metadata.xml
index 597547cc..9fb3128f 100644
--- a/swamid-interfederations-2.0/engine.eduteams.org-authentication-sp-metadata.xml
+++ b/swamid-interfederations-2.0/engine.eduteams.org-authentication-sp-metadata.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <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">eduTEAMs</mdui:DisplayName>
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
index e606162e..aeb97195 100644
--- a/swamid-interfederations-2.0/engine.surfconext.nl-authentication-sp-metadata.xml
+++ b/swamid-interfederations-2.0/engine.surfconext.nl-authentication-sp-metadata.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <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>
diff --git a/swamid-interfederations-2.0/engine.t.eduteams.org-authentication-sp-metadata.xml b/swamid-interfederations-2.0/engine.t.eduteams.org-authentication-sp-metadata.xml
index 960ec413..cdd88b81 100644
--- a/swamid-interfederations-2.0/engine.t.eduteams.org-authentication-sp-metadata.xml
+++ b/swamid-interfederations-2.0/engine.t.eduteams.org-authentication-sp-metadata.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <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">eduTEAMs (Test)</mdui:DisplayName>
diff --git a/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml b/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml
index 1ac796e9..08eb80e0 100644
--- a/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml
@@ -116,15 +116,15 @@ v6m7bak466pL1Vevz4zJrf1D/GO7tuEr1UKaACEO7dN9s48BIszFS876vdltnwqo
       <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="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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: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="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"/>
       <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"/>
+      <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="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: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"/>
+      <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>
diff --git a/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml b/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml
index 34517ede..f61f8889 100644
--- a/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml
+++ b/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://europe-stage.wiseflow.net">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-07-15T15:12:01Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-07-15T15:12:01Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:Description xml:lang="da">Formålet er at facilitere digital håndtering af skriftlige eksaminer.</mdui:Description>
@@ -23,7 +23,7 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://europe-stage.wiseflow.net/simplesaml/module.php/saml/sp/saml2-logout.php/europe-stage_wayf"/>
     <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://europe-stage.wiseflow.net/simplesaml/module.php/saml/sp/saml2-acs.php/europe-stage_wayf" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" Location="https://europe-stage.wiseflow.net/simplesaml/module.php/saml/sp/saml2-acs.php/europe-stage_wayf"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">WISEflow europe-stage</md:ServiceName>
       <md:ServiceName xml:lang="en">WISEflow europe-stage</md:ServiceName>
@@ -48,8 +48,7 @@
     <md:OrganizationURL xml:lang="en">http://uniwise.dk</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:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/europe.wiseflow.net.xml b/swamid-interfederations-2.0/europe.wiseflow.net.xml
index 137f974e..403e7561 100644
--- a/swamid-interfederations-2.0/europe.wiseflow.net.xml
+++ b/swamid-interfederations-2.0/europe.wiseflow.net.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://europe.wiseflow.net">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-05-29T12:55:43Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-05-29T12:55:43Z" 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 AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:Description xml:lang="da">Formålet er at facilitere digital håndtering af skriftlige eksaminer.</mdui:Description>
@@ -23,7 +23,7 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://europe.wiseflow.net/simplesaml/module.php/saml/sp/saml2-logout.php/europe_wayf"/>
     <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://europe.wiseflow.net/simplesaml/module.php/saml/sp/saml2-acs.php/europe_wayf" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" Location="https://europe.wiseflow.net/simplesaml/module.php/saml/sp/saml2-acs.php/europe_wayf"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">WISEflow</md:ServiceName>
       <md:ServiceName xml:lang="en">WISEflow</md:ServiceName>
@@ -48,8 +48,7 @@
     <md:OrganizationURL xml:lang="en">http://uniwise.dk</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:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml
index b8c7ddf7..a2b06f14 100644
--- a/swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml
@@ -13,6 +13,9 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nebraska.edu</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">University of Nebraska</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.nebraska.edu/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.nebraska.edu/bylaws-and-policies.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="75" width="284" xml:lang="en">https://fed.nebraska.edu/idp/images/un_master_bk_incommon.jpg</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml
deleted file mode 100644
index d9b4d642..00000000
--- a/swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fed.nhtv.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-08-09T12: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:Description xml:lang="nl">NHTV internationaal hoger onderwijs Breda</mdui:Description>
-        <mdui:Description xml:lang="en">NHTV Breda University of Applied Sciences</mdui:Description>
-        <mdui:Logo height="48" width="78">https://static.surfconext.nl/logos/idp/nhtv.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">NHTV Breda University of Applied Sciences</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">NHTV Breda University of Applied Sciences Nationale Hogeschool voor Toerisme en Verkeer</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/d5f955107c70b084e9df9a1e8261e973"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">NHTV internationaal hoger onderwijs Breda</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">NHTV Breda University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">NHTV internationaal hoger onderwijs Breda</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NHTV Breda University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.nhtv.nl</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.nhtv.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/federatie.clusius.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml
deleted file mode 100644
index 1dbaa255..00000000
--- a/swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federatie.clusius.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-23T12: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">Clusius College (old)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Clusius College (old)</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Clusius College</mdui:Description>
-        <mdui:Description xml:lang="en">Clusius College</mdui:Description>
-        <mdui:Logo height="37" width="108">https://static.surfconext.nl/logos/idp/clusius.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Clusius College MBO</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Clusius College MBO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/47d9881f7198a3e15644c76503f0402d"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Clusius College (old)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Clusius College (old)</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/federation.bretagne.iufm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml
index c004ee9f..263b143f 100644
--- a/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml
@@ -20,6 +20,32 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+					      MIIDVzCCAj+gAwIBAgIUKmBCYXflPLtHr7RZnoMPn/DvtmgwDQYJKoZIhvcNAQEF
+BQAwJjEkMCIGA1UEAxMbZmVkZXJhdGlvbi5icmV0YWduZS5pdWZtLmZyMB4XDTEz
+MDIwNTEzMTQxNVoXDTMzMDIwNTEzMTQxNVowJjEkMCIGA1UEAxMbZmVkZXJhdGlv
+bi5icmV0YWduZS5pdWZtLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAnGjACvIl7EYKjKCH0NF4ebs+TiUOvceisAhINr5e4O/BgsEV0pdwWky84VW4
+34IOhhS1OZfNof3DGqIFjIG10D+MMYR56+VWjLV1l4jTzPhxEM1Da4B9opclIqfa
+TuvYTG5taAQ0zH5F0/igiQwgfdQnb8JUb4GlKfvjrwGBEBrV4EdCwuII5gPTWlJP
+q5g5b4fYuLoCxpd21mzi85oVMB39IHCi8r3hlVHvnmdPCINW7DGF9ZSeQzmhJnCB
+D6qm+tOmLtj8PJTNvQ+w89BYCbcdEUOIc8QnGPcupP3eYbp3O03YE4Dslwxed2pT
+S/rBd8Nug44TIPqTPX5V7DaRNQIDAQABo30wezBaBgNVHREEUzBRghtmZWRlcmF0
+aW9uLmJyZXRhZ25lLml1Zm0uZnKGMmh0dHBzOi8vZmVkZXJhdGlvbi5icmV0YWdu
+ZS5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQs9Bw6sfV70qXt48wu
+K1zo2uyoYzANBgkqhkiG9w0BAQUFAAOCAQEAY3y7sMljpfd/g1fNhDxnOYRevqi1
+Ee88d37yE/yVPapmcSHdIzV6vrDl+g+2cD1+sPB5Y5dMVixiptVX5+1ey55Mpb4e
+MTzmP7yDaL1eHKN+7NndjBOdF8nXheaB+/PRXuwp3dlSQrumH2kIPGA2iLHXHDlp
+ytKmSaXH1HkcgcjQe5cgHinQd9sA22s4pMJ309e6Y/8+IUq7Vc75+1YrnnDHF7mx
+XwWUOQkoMHoHa30vcT2jQVKThDWJj7WLPSDv9t0CTUy8ToOSBTfvooHJOZhsLQzG
+Igfeq0NJEYoEobPu+TwPdcY7Mzham8UC11Kt0r95Ti9Wpfe7OfMDHhPmfA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEhDCCA2ygAwIBAgIRAPSODBFpc8g+0TGgl6Q8SN8wDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMzAyMTEwMDAwMDBaFw0xNjA0MDUyMzU5NTlaMEkxITAfBgNV
@@ -49,39 +75,6 @@ hjz3pTN+SFo=
         </ds: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"/>
@@ -97,6 +90,32 @@ HF+7wdprWF0e2/C+accIlza8LuwyPv+M5K2Q6XonBrAbHEuWJTFfJ9CxkzK9oj5+
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+					      MIIDVzCCAj+gAwIBAgIUKmBCYXflPLtHr7RZnoMPn/DvtmgwDQYJKoZIhvcNAQEF
+BQAwJjEkMCIGA1UEAxMbZmVkZXJhdGlvbi5icmV0YWduZS5pdWZtLmZyMB4XDTEz
+MDIwNTEzMTQxNVoXDTMzMDIwNTEzMTQxNVowJjEkMCIGA1UEAxMbZmVkZXJhdGlv
+bi5icmV0YWduZS5pdWZtLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAnGjACvIl7EYKjKCH0NF4ebs+TiUOvceisAhINr5e4O/BgsEV0pdwWky84VW4
+34IOhhS1OZfNof3DGqIFjIG10D+MMYR56+VWjLV1l4jTzPhxEM1Da4B9opclIqfa
+TuvYTG5taAQ0zH5F0/igiQwgfdQnb8JUb4GlKfvjrwGBEBrV4EdCwuII5gPTWlJP
+q5g5b4fYuLoCxpd21mzi85oVMB39IHCi8r3hlVHvnmdPCINW7DGF9ZSeQzmhJnCB
+D6qm+tOmLtj8PJTNvQ+w89BYCbcdEUOIc8QnGPcupP3eYbp3O03YE4Dslwxed2pT
+S/rBd8Nug44TIPqTPX5V7DaRNQIDAQABo30wezBaBgNVHREEUzBRghtmZWRlcmF0
+aW9uLmJyZXRhZ25lLml1Zm0uZnKGMmh0dHBzOi8vZmVkZXJhdGlvbi5icmV0YWdu
+ZS5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQs9Bw6sfV70qXt48wu
+K1zo2uyoYzANBgkqhkiG9w0BAQUFAAOCAQEAY3y7sMljpfd/g1fNhDxnOYRevqi1
+Ee88d37yE/yVPapmcSHdIzV6vrDl+g+2cD1+sPB5Y5dMVixiptVX5+1ey55Mpb4e
+MTzmP7yDaL1eHKN+7NndjBOdF8nXheaB+/PRXuwp3dlSQrumH2kIPGA2iLHXHDlp
+ytKmSaXH1HkcgcjQe5cgHinQd9sA22s4pMJ309e6Y/8+IUq7Vc75+1YrnnDHF7mx
+XwWUOQkoMHoHa30vcT2jQVKThDWJj7WLPSDv9t0CTUy8ToOSBTfvooHJOZhsLQzG
+Igfeq0NJEYoEobPu+TwPdcY7Mzham8UC11Kt0r95Ti9Wpfe7OfMDHhPmfA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEhDCCA2ygAwIBAgIRAPSODBFpc8g+0TGgl6Q8SN8wDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMzAyMTEwMDAwMDBaFw0xNjA0MDUyMzU5NTlaMEkxITAfBgNV
@@ -126,39 +145,6 @@ hjz3pTN+SFo=
         </ds: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>
diff --git a/swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml
index 39a86660..9672a50d 100644
--- a/swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml
@@ -7,8 +7,8 @@
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esiee.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">ESIEE Paris</mdui:DisplayName>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABS0lEQVQ4y62TPUhCURTHf/fp08o0GqItiMCgpb2puRRa+iBotak5guwD3dqqpZagJXO2KSKKhhaXxiiqoQKpQSFU3vPeBvM99b3wEZ3p3P+553fOPYcraFhaQf5oh4fzBNKIIDRcbWAsx+VWvHEUViC+v8TT9TFKgi9YZHIjRukl0pIsDY3o1AeKW5L1VL8VfLyIoel1Xw8V6I/esDtKJ7P7FJpp+2hsi47JrYA/2i8AIV3lTeWQ/K4Xq6VBpvcOMCvdACip0Tf8Cqx6A0gjwvNVokV7y8P4rEeAphcZmjjFrHRZmpIB7k7mgGxnQDBS4Gxl2aGnFGQXvQxRuetJ52r/dY3NeOUV0DQDUbNcsxwmpeoYtx6V/Ry7aloFySxUUD8cveedQKiAapuHqoWYORxhvf0zGVSZzwjuc2t8fYaRpg8lnfWNcm/z8Ru34GJlf61mMQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MSswMjowMBnHrEYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDErMDI6MDBomhT6AAAAAElFTkSuQmCC</mdui:Logo>
@@ -50,8 +50,8 @@ lLvxcvJ5CJp7Xtli
   </md:IDPSSODescriptor>
   <md: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esiee.fr</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml
deleted file mode 100644
index 41bd866b..00000000
--- a/swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federation.hanze.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-12T10:50: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">Hanzehogeschool Groningen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Hanze University of Applied Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Hanzehogeschool Groningen</mdui:Description>
-        <mdui:Description xml:lang="en">Hanze University of Applied Sciences</mdui:Description>
-        <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/hanze.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">hanze university groningen hanzehogeschool groningen hbo applied sciences</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">hanze university groningen hanzehogeschool groningen 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/193a3229f49c46a0b0a0f063f44b7696"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Hanzehogeschool Groningen</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Hanze University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Hanzehogeschool Groningen</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Hanze University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">https://www.hanze.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.hanze.nl/eng</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.u-pem.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.u-pem.fr-idp-shibboleth.xml
index fd373689..e056e79d 100644
--- a/swamid-interfederations-2.0/federation.u-pem.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/federation.u-pem.fr-idp-shibboleth.xml
@@ -7,10 +7,10 @@
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etud.u-pem.fr</shibmd:Scope>
       <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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-mlv.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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACOUlEQVQ4y32TO2uUYRCFnzP77cZNCN4tIiiKGlARCxW8gFrbCFp4AVN4+QNil84yCmIlKBiLBMRCREEEK0m00kLFC6IGxQtrQgy462az33ssEk2MklNNMTycmTOjyuHyASJ6sG8u66+dBqgcaT1vtF+QA0YYI0QIqoZbJVcvLOhnNBSaD1oFdDCtDkmrp+oWUCdQxozZrMOcmVDrQYBgDknusemdrHUbfELiCVIZaxdANicAVRWugbC9D7TJZhM4N371F8BSi3eTsYc0/EZF/8trB5YZ3oc04IavTgJMBfk7Zkelo61bbzwObDeuWh7DrJgC3ChIF1NqTCwpNj6qjzpAFqo9SG67DJxCdINsMR721VKj9qhRat3syXmGF/f9eDHbVrZoDT+q7zhXT2nA1kaLZgG/KmU/B9tHqY7M9z2Fh0I8NYguWgCoMaEb5Nnw23k7McftaEpkMkrm68/Utnx8oU8itctcW9RXfVY5PG8XE4UuAEp5L9QHMxxrjbqQ64ZRQyj4FvKIkw6BlpjUMnKUxzmFY6AT4DrEADA4HaP9KNBZRDg1P4SKK/PpQLfb5b3AVjRrBzNS35LgEhBE8XpKfoj+dC+14gymE5z+DxCj2E8wITNkkwgE/gIko53gMeAlsP4/Dvgc6E4OESIR7DW0AS+A78By8GOjMZkNv0eZCdiWxBUBUx4LoCJO40L3be8xuhuwceaVZsr9lHDPn5edISuFxOtiNO838kK5KN1rkoYgPsk8B/gF70QJKkYG+1EAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDkrMDI6MDDF6okfAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQ5KzAyOjAwtLcxowAAAABJRU5ErkJggg==</mdui:Logo>
diff --git a/swamid-interfederations-2.0/fod.geant.net-shibboleth.xml b/swamid-interfederations-2.0/fod.geant.net-shibboleth.xml
deleted file mode 100644
index 2131d427..00000000
--- a/swamid-interfederations-2.0/fod.geant.net-shibboleth.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?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 561ab61c..3933a34a 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
@@ -45,14 +45,14 @@
       <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 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"/>
-      <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="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="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml b/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
index 8787f105..abdaa91b 100644
--- a/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
+++ b/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
@@ -1,7 +1,7 @@
 <?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:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-06T06:41: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">
@@ -91,15 +91,15 @@ D5s3OfoyrsZf5VHSjcxoteZ+NQBmcCgYkgjzXQ==
     <md:OrganizationURL xml:lang="it">http://www.switch.ch/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
-    <md:GivenName>SWITCHaai</md:GivenName>
+    <md:GivenName>forge</md:GivenName>
     <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
+    <md:EmailAddress>mailto:support@switch.ch</md:EmailAddress>
     <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>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:GivenName>Fergus</md:GivenName>
+    <md:SurName>Kerins</md:SurName>
+    <md:EmailAddress>mailto:fergus.kerins@switch.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 44 268 15 42</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml b/swamid-interfederations-2.0/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml
deleted file mode 100644
index ad461be3..00000000
--- a/swamid-interfederations-2.0/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fr-rennes1-shibboleth.moveon4.com/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-02-10T13:01:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>https://federation.renater.fr/category/logiciel</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/commercial</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">MoveON - software for international activity management</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://moveon4.com/513</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Moveon enables institutions of higher education to succeed in the highly internationalised world of higher education. International offices can easily control and manage all internationalisation activities, reduce their daily administrative workload and save time and money.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">MoveON - Logiciel de gestion des activités Internationales</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Dans le monde fortement internationalisé de l'enseignement supérieur, MoveON appuie les établissements d'enseignement supérieur dans leur réussite quotidienne. Les services des Relations Internationales peuvent ainsi facilement contrôler et gérer toutes les activités d'internationalisation, réduire leur charge de travail administrative quotidienne et gagner en temps et en argent.</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>
-					      MIIFgTCCA2mgAwIBAgIJAMwjeTq6427PMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
-BAYTAkRFMRwwGgYDVQQKDBNRUyB1bmlzb2x1dGlvbiBHbWJIMSowKAYDVQQDDCFm
-ci1yZW5uZXMxLXNoaWJib2xldGgubW92ZW9uNC5jb20wHhcNMTMxMDE4MTIzMjAx
-WhcNMzMxMDEzMTIzMjAxWjBXMQswCQYDVQQGEwJERTEcMBoGA1UECgwTUVMgdW5p
-c29sdXRpb24gR21iSDEqMCgGA1UEAwwhZnItcmVubmVzMS1zaGliYm9sZXRoLm1v
-dmVvbjQuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAo5gJXFe1
-2g8Quhi/cNXAjEfKIWAknNVglyr2j+bQW0LJC4qbbYBgi76Xi0jiYXs0BFW1Fn5U
-u6SYjneFdhvBuchwO1yRYhA/DGk71dro07qbWBlnyZE173/5MEA2GcdcFI7nwlzO
-hIMZ3Stair2e/kkl/Jasv3x1qDGWYLnRruVwiWoYsTJ9rPTjYwvSBRlF8xkBn138
-v3+pp2OgbZ7OwXNKGkg7CWsDEIo9rsJ5pfTI9iIHD4CtBylZltXGZM3Ur5DysJKa
-cjnax3wqcNdi2oepq2p/uzb99oP6qty01h26q+RvHyXZ35Rr8WAA01eGgcceKwIy
-ZIt92WD8CCtNCLb9ZollbYfuQrS8zLvPgYcy6cMgngDiqm+QN6H3fHq5zyxJ7+/X
-7Xn8yNi3fwNX5UAM4UVnnRKMDugqdY7Tn3TQr1ciIhyslEaW2PtwyOfL8eOLAdtx
-8psVs2g2jkvhxMYreR8IKEyevoXu6tEzjbEArfmg3PVk6rjVb1ecpH+u9s6LfoRb
-+VL7QcfMQP/pzyI7wnGBq+eur2779yCJ7eDoAlsYoSYFXiQzjVOFSAaiibU+9URL
-PCYApGw5n/9AE8722lAbq8lfo3Roe/nKv9FaPHr96CzTLUemF7tXRnTT6ttvWtOj
-g94reZ34ZscGngAZUIvc+ASXWrh5iPIKH4ECAwEAAaNQME4wHQYDVR0OBBYEFCZU
-Hgz/G7GV+x27JvXYq0sRSmmpMB8GA1UdIwQYMBaAFCZUHgz/G7GV+x27JvXYq0sR
-SmmpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAAOq5QsqOL/SBiq4
-7tIXdOw8VNM/FtleNM0hMpIoS9ivRk075F4jcZymbMNq0gwbj3lIKAji9RO7dIPY
-ll5EL4jdjqVzxtg1iEb6xJS9G8m5QZC0IaNPoEGeWRwIYIdRldDEum4LRnWqYXAq
-SlVCRayRQCCs4DlO7RIH84lxPuaVlVDahDVjX2eR9lf/uul+d0zoP/C8Mz5Cvatn
-51NZoFLZpFZ1PxiqxylggSzVmygXLWpfWhqX8Prx/eXjXRKjUHnzFPWgmNmnGpcb
-UCpF7K5PPMz4FiUYid0v0Ac84zg+rPEV+9dPEL1usKOl9BvuH3lTyZtuBmp0Kx1e
-OqTC8Mf+b414tRV0KhZzCTaITouTcPi6kN9Jtr200Ig5R4WJ0hQwrwz76+Zc5T/P
-Q4fYDZE+qVryDsGh3IRMtsiYJ+/pPKk3HgSwEicXP7HApZbGvCco/rHXrW+KiHgT
-l/BRl/FYOs2w8wRLADgOiQGT92xtLIjuDUcGVzxRK1dyTaCR4aMX1YIAb+h3im0f
-rrPJSF3aEIjK187ZpbTIY0gOLJUF0ELDLJy4Ql2EW1Z5hSJEo9VJy3z/3auv9IyH
-fYz9g//4YOQZaSQ5c3wgr+got1KVUh3fFQ82d2DC1YFp/wufjKeLfA6zhQYZU1g3
-5l0v1ZR1poQgqV6AJfPMlW+DyGU+
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIFgTCCA2mgAwIBAgIJAMwjeTq6427PMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
-BAYTAkRFMRwwGgYDVQQKDBNRUyB1bmlzb2x1dGlvbiBHbWJIMSowKAYDVQQDDCFm
-ci1yZW5uZXMxLXNoaWJib2xldGgubW92ZW9uNC5jb20wHhcNMTMxMDE4MTIzMjAx
-WhcNMzMxMDEzMTIzMjAxWjBXMQswCQYDVQQGEwJERTEcMBoGA1UECgwTUVMgdW5p
-c29sdXRpb24gR21iSDEqMCgGA1UEAwwhZnItcmVubmVzMS1zaGliYm9sZXRoLm1v
-dmVvbjQuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAo5gJXFe1
-2g8Quhi/cNXAjEfKIWAknNVglyr2j+bQW0LJC4qbbYBgi76Xi0jiYXs0BFW1Fn5U
-u6SYjneFdhvBuchwO1yRYhA/DGk71dro07qbWBlnyZE173/5MEA2GcdcFI7nwlzO
-hIMZ3Stair2e/kkl/Jasv3x1qDGWYLnRruVwiWoYsTJ9rPTjYwvSBRlF8xkBn138
-v3+pp2OgbZ7OwXNKGkg7CWsDEIo9rsJ5pfTI9iIHD4CtBylZltXGZM3Ur5DysJKa
-cjnax3wqcNdi2oepq2p/uzb99oP6qty01h26q+RvHyXZ35Rr8WAA01eGgcceKwIy
-ZIt92WD8CCtNCLb9ZollbYfuQrS8zLvPgYcy6cMgngDiqm+QN6H3fHq5zyxJ7+/X
-7Xn8yNi3fwNX5UAM4UVnnRKMDugqdY7Tn3TQr1ciIhyslEaW2PtwyOfL8eOLAdtx
-8psVs2g2jkvhxMYreR8IKEyevoXu6tEzjbEArfmg3PVk6rjVb1ecpH+u9s6LfoRb
-+VL7QcfMQP/pzyI7wnGBq+eur2779yCJ7eDoAlsYoSYFXiQzjVOFSAaiibU+9URL
-PCYApGw5n/9AE8722lAbq8lfo3Roe/nKv9FaPHr96CzTLUemF7tXRnTT6ttvWtOj
-g94reZ34ZscGngAZUIvc+ASXWrh5iPIKH4ECAwEAAaNQME4wHQYDVR0OBBYEFCZU
-Hgz/G7GV+x27JvXYq0sRSmmpMB8GA1UdIwQYMBaAFCZUHgz/G7GV+x27JvXYq0sR
-SmmpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAAOq5QsqOL/SBiq4
-7tIXdOw8VNM/FtleNM0hMpIoS9ivRk075F4jcZymbMNq0gwbj3lIKAji9RO7dIPY
-ll5EL4jdjqVzxtg1iEb6xJS9G8m5QZC0IaNPoEGeWRwIYIdRldDEum4LRnWqYXAq
-SlVCRayRQCCs4DlO7RIH84lxPuaVlVDahDVjX2eR9lf/uul+d0zoP/C8Mz5Cvatn
-51NZoFLZpFZ1PxiqxylggSzVmygXLWpfWhqX8Prx/eXjXRKjUHnzFPWgmNmnGpcb
-UCpF7K5PPMz4FiUYid0v0Ac84zg+rPEV+9dPEL1usKOl9BvuH3lTyZtuBmp0Kx1e
-OqTC8Mf+b414tRV0KhZzCTaITouTcPi6kN9Jtr200Ig5R4WJ0hQwrwz76+Zc5T/P
-Q4fYDZE+qVryDsGh3IRMtsiYJ+/pPKk3HgSwEicXP7HApZbGvCco/rHXrW+KiHgT
-l/BRl/FYOs2w8wRLADgOiQGT92xtLIjuDUcGVzxRK1dyTaCR4aMX1YIAb+h3im0f
-rrPJSF3aEIjK187ZpbTIY0gOLJUF0ELDLJy4Ql2EW1Z5hSJEo9VJy3z/3auv9IyH
-fYz9g//4YOQZaSQ5c3wgr+got1KVUh3fFQ82d2DC1YFp/wufjKeLfA6zhQYZU1g3
-5l0v1ZR1poQgqV6AJfPMlW+DyGU+
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fr-rennes1-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fr-rennes1-shibboleth.moveon4.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">MoveON - Logiciel de gestion des activités Internationales</md:ServiceName>
-      <md:ServiceName xml:lang="en">MoveON - software for international activity management</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Dans le monde fortement internationalisé de l'enseignement supérieur, MoveON appuie les établissements d'enseignement supérieur dans leur réussite quotidienne. Les services des Relations Internationales peuvent ainsi facilement contrôler et gérer toutes les activités d'internationalisation, réduire leur charge de travail administrative quotidienne et gagner en temps et en argent.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Moveon enables institutions of higher education to succeed in the highly internationalised world of higher education. International offices can easily control and manage all internationalisation activities, reduce their daily administrative workload and save time and money.</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">QS UNISOLUTION</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">QS UNISOLUTION</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Kamran Tabassum</md:SurName>
-    <md:EmailAddress>kamran@zeptosystems.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml b/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml
index 5f076dc2..a970a4cf 100644
--- a/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml
+++ b/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml
@@ -14,7 +14,7 @@
         <mdui:Description xml:lang="de">(TEST) RESTENA FileSender ist eine sichere Methode grosse Dateien mit jedermann zu teilen! Verbinden Sie sich um Dateien zu verschicken oder um jemanden aufzufordern Ihnen eine Datei zu schicken.</mdui:Description>
         <mdui:Description xml:lang="lb">(TEST) De RESTENA FileSender ass e séchere Wee, fir grouss Fichieren ze verschécken! Loggt Iech an, fir Fichieren eropzelueden oder aner Leit ze invitéieren, Iech Fichieren ze schécken.</mdui:Description>
         <mdui:Keywords xml:lang="en">RESTENA FileSender large XXL file transfer</mdui:Keywords>
-        <mdui:Logo height="100" width="100" xml:lang="en">http://fs-test.restena.lu/filesender.png</mdui:Logo>
+        <mdui:Logo width="100" height="100" xml:lang="en">http://fs-test.restena.lu/filesender.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml
index 34693d6d..b564b9c2 100644
--- a/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml
@@ -5,7 +5,7 @@
       <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:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="fs.liu.se">
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
@@ -41,87 +41,87 @@ G7u2lFQuAIzdjRsBLntKNPKgiHqkOOk8w9dPs56MXnfzAjGIIu5IasvXmhTF</ds:X509Certificate
       </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:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
         <auth:DisplayName>E-Mail Address</auth:DisplayName>
         <auth:Description>The e-mail address of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
         <auth:DisplayName>Given Name</auth:DisplayName>
         <auth:Description>The given name of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
         <auth:DisplayName>Name</auth:DisplayName>
         <auth:Description>The unique name of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
         <auth:DisplayName>UPN</auth:DisplayName>
         <auth:Description>The user principal name (UPN) of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/CommonName">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
         <auth:DisplayName>Common Name</auth:DisplayName>
         <auth:Description>The common name of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/EmailAddress">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
         <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
         <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/Group">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
         <auth:DisplayName>Group</auth:DisplayName>
         <auth:Description>A group that the user is a member of</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/UPN">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
         <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
         <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
         <auth:DisplayName>Role</auth:DisplayName>
         <auth:Description>A role that the user has</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
         <auth:DisplayName>Surname</auth:DisplayName>
         <auth:Description>The surname of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
         <auth:DisplayName>PPID</auth:DisplayName>
         <auth:Description>The private identifier of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
         <auth:DisplayName>Name ID</auth:DisplayName>
         <auth:Description>The SAML name identifier of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
         <auth:DisplayName>Authentication time stamp</auth:DisplayName>
         <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
         <auth:DisplayName>Authentication method</auth:DisplayName>
         <auth:Description>The method used to authenticate the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
         <auth:DisplayName>Deny only group SID</auth:DisplayName>
         <auth:Description>The deny-only group SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
         <auth:DisplayName>Deny only primary SID</auth:DisplayName>
         <auth:Description>The deny-only primary SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
         <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
         <auth:Description>The deny-only primary group SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
         <auth:DisplayName>Group SID</auth:DisplayName>
         <auth:Description>The group SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
         <auth:DisplayName>Primary group SID</auth:DisplayName>
         <auth:Description>The primary group SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
         <auth:DisplayName>Primary SID</auth:DisplayName>
         <auth:Description>The primary SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
         <auth:DisplayName>Windows account name</auth:DisplayName>
         <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
       </auth:ClaimType>
@@ -157,7 +157,7 @@ G7u2lFQuAIzdjRsBLntKNPKgiHqkOOk8w9dPs56MXnfzAjGIIu5IasvXmhTF</ds:X509Certificate
       </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:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:SecurityTokenServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="fs.liu.se">
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
@@ -197,87 +197,87 @@ wHb3flDe4OLwxxMZfI3oGwoUJHltib7xFuT7w5hOYts3Js+BBtsSskGSp/dz8PiH
       <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:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
         <auth:DisplayName>E-Mail Address</auth:DisplayName>
         <auth:Description>The e-mail address of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
         <auth:DisplayName>Given Name</auth:DisplayName>
         <auth:Description>The given name of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
         <auth:DisplayName>Name</auth:DisplayName>
         <auth:Description>The unique name of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
         <auth:DisplayName>UPN</auth:DisplayName>
         <auth:Description>The user principal name (UPN) of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/CommonName">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
         <auth:DisplayName>Common Name</auth:DisplayName>
         <auth:Description>The common name of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/EmailAddress">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
         <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
         <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/Group">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
         <auth:DisplayName>Group</auth:DisplayName>
         <auth:Description>A group that the user is a member of</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/UPN">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
         <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
         <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
         <auth:DisplayName>Role</auth:DisplayName>
         <auth:Description>A role that the user has</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
         <auth:DisplayName>Surname</auth:DisplayName>
         <auth:Description>The surname of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
         <auth:DisplayName>PPID</auth:DisplayName>
         <auth:Description>The private identifier of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
         <auth:DisplayName>Name ID</auth:DisplayName>
         <auth:Description>The SAML name identifier of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
         <auth:DisplayName>Authentication time stamp</auth:DisplayName>
         <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
         <auth:DisplayName>Authentication method</auth:DisplayName>
         <auth:Description>The method used to authenticate the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
         <auth:DisplayName>Deny only group SID</auth:DisplayName>
         <auth:Description>The deny-only group SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
         <auth:DisplayName>Deny only primary SID</auth:DisplayName>
         <auth:Description>The deny-only primary SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
         <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
         <auth:Description>The deny-only primary group SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
         <auth:DisplayName>Group SID</auth:DisplayName>
         <auth:Description>The group SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
         <auth:DisplayName>Primary group SID</auth:DisplayName>
         <auth:Description>The primary group SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
         <auth:DisplayName>Primary SID</auth:DisplayName>
         <auth:Description>The primary SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
         <auth:DisplayName>Windows account name</auth:DisplayName>
         <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
       </auth:ClaimType>
@@ -286,7 +286,7 @@ wHb3flDe4OLwxxMZfI3oGwoUJHltib7xFuT7w5hOYts3Js+BBtsSskGSp/dz8PiH
       <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">
+          <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex">
             <wsx:MetadataSection xmlns="" Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex">
               <wsx:MetadataReference>
                 <Address xmlns="http://www.w3.org/2005/08/addressing">https://fs.liu.se/adfs/services/trust/mex</Address>
@@ -391,8 +391,8 @@ G7u2lFQuAIzdjRsBLntKNPKgiHqkOOk8w9dPs56MXnfzAjGIIu5IasvXmhTF</ds:X509Certificate
         <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:Logo xml:lang="sv" height="68" width="350">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="68" width="350">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">liu linköpings+universitet linkopings+universitet linkoping+university linköpings+university linköping linkoping</mdui:Keywords>
         <mdui:Keywords xml:lang="en">liu linköpings+universitet linkopings+universitet linkoping+university linköpings+university linköping linkoping</mdui:Keywords>
       </mdui:UIInfo>
@@ -479,27 +479,27 @@ G7u2lFQuAIzdjRsBLntKNPKgiHqkOOk8w9dPs56MXnfzAjGIIu5IasvXmhTF</ds:X509Certificate
     <md:NameIDFormat>urn:oasis:names: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"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
   </md:IDPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="sv">Linköping University</md:OrganizationName>
diff --git a/swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml
index fc7a0f70..29a6df46 100644
--- a/swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml
@@ -95,8 +95,8 @@
     <EmailAddress>mailto:webmaster@ncl.ac.uk</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
-    <GivenName>Caleb</GivenName>
-    <SurName>Racey</SurName>
-    <EmailAddress>mailto:Caleb.Racey@ncl.ac.uk</EmailAddress>
+    <GivenName>Chris</GivenName>
+    <SurName>Franks</SurName>
+    <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
index a5722f1e..6a96c976 100644
--- a/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
@@ -13,7 +13,7 @@
       <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:Logo height="90" width="350">https://auth.edina.ac.uk/public/images/splogos/digimap.png</mdui:Logo>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.xml b/swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
index b191352a..b5d349e0 100644
--- a/swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
@@ -15,7 +15,7 @@
         <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:Logo xml:lang="sv" height="107" width="204">https://gihidentity01.ihs.se/idp/images/gihlogo.gif</mdui:Logo>
         <mdui:Keywords xml:lang="sv">gih gymnastik-+och+idrottshögskolan the+swedish+school+of+sport+and+health+sciences</mdui:Keywords>
         <mdui:Keywords xml:lang="en">gih gymnastik-+och+idrottshögskolan the+swedish+school+of+sport+and+health+sciences</mdui:Keywords>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml b/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml
index dbf58db0..73801b5b 100644
--- a/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml
+++ b/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml
@@ -82,10 +82,10 @@ BoZyB+cmraisCTXvHKNw8Jc97GlS9L5soe6vlTUh50RlVt24
       <md:ServiceName xml:lang="en">IN2P3 - Gitlab dev</md:ServiceName>
       <md:ServiceDescription xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs (instance de test).</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates (test instance).</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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>
diff --git a/swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml b/swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml
index d9f37338..9fba1d9f 100644
--- a/swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml
+++ b/swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml
@@ -82,9 +82,9 @@ iFJVpavS2JG8mIKKAznQiZvqphE=
       <md:ServiceName xml:lang="en">IN2P3 - Gitlab</md:ServiceName>
       <md:ServiceDescription xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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>
diff --git a/swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml
index 7cc57772..149e3d02 100644
--- a/swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gn-vho.grnet.gr/idp/shibboleth">
+<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>
diff --git a/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml b/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml
index d6ad1a9e..5cd28e2b 100644
--- a/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml
@@ -16,7 +16,7 @@
         <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:Logo xml:lang="sv" height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
         <mdui:Keywords xml:lang="sv">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+science borås+university+of+library+science</mdui:Keywords>
         <mdui:Keywords xml:lang="en">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+science borås+university+of+library+science</mdui:Keywords>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml b/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml
index 4ed121d9..a501fbb7 100644
--- a/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml
@@ -37,7 +37,7 @@
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hexaa.eduid.hu/Shibboleth.sso/SLO/Redirect"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hexaa.eduid.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hexaa.eduid.hu/Shibboleth.sso/SAML2/POST" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hexaa.eduid.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="hu">HEXAA</md:ServiceName>
       <md:ServiceName xml:lang="en">HEXAA</md:ServiceName>
diff --git a/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml
index da30757f..626005fc 100644
--- a/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hpc-wayf.sdu.dk/module.php/saml/sp/metadata.php/default-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2014-05-27T10:41:03Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2014-05-27T10:41:03Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:Description xml:lang="da">Formålet er at administrere bruger-adgangen til HPC-centret.</mdui:Description>
@@ -23,7 +23,7 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hpc-wayf.sdu.dk/module.php/saml/sp/saml2-logout.php/default-sp"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hpc-wayf.sdu.dk/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" Location="https://hpc-wayf.sdu.dk/module.php/saml/sp/saml2-acs.php/default-sp"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">DeIC Nationale HPC-Center, SDU</md:ServiceName>
       <md:ServiceName xml:lang="en">DeIC National HPC Centre, SDU</md:ServiceName>
@@ -46,8 +46,8 @@
     <md:OrganizationURL xml:lang="en">http://www.sdu.dk/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:GivenName>Lasse</md:GivenName>
+    <md:SurName>Birnbaum Jensen</md:SurName>
+    <md:EmailAddress>lasse@sdu.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.uakron.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/id.uakron.edu-idp-shibboleth.xml
index 0f0ac21f..27a3a0b8 100644
--- a/swamid-interfederations-2.0/id.uakron.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/id.uakron.edu-idp-shibboleth.xml
@@ -45,7 +45,6 @@ yKK0Tva8sW6/o1lASk+4Xe+Gj9fkQ8TdonS43+5kgepXP0U=
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.uakron.edu/idp/profile/Shibboleth/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.uakron.edu/idp/profile/SAML2/POST/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.uakron.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.uakron.edu/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
   <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
@@ -85,15 +84,11 @@ yKK0Tva8sW6/o1lASk+4Xe+Gj9fkQ8TdonS43+5kgepXP0U=
     <md:OrganizationURL xml:lang="en">http://www.uakron.edu/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
-    <md:GivenName>Keith Hunt</md:GivenName>
-    <md:EmailAddress>keith@uakron.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Keith Piepho</md:GivenName>
-    <md:EmailAddress>kap@uakron.edu</md:EmailAddress>
+    <md:GivenName>Shib Admin</md:GivenName>
+    <md:EmailAddress>shibadmin@uakron.edu</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Andrew Lucas</md:GivenName>
-    <md:EmailAddress>arl14@uakron.edu</md:EmailAddress>
+    <md:GivenName>Shib Tech</md:GivenName>
+    <md:EmailAddress>shibtech@uakron.edu</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml
index 1a715772..af8752df 100644
--- a/swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml
@@ -11,7 +11,7 @@
         <mdui:DisplayName xml:lang="en">University of Luxembourg</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity provider for members of the University of Luxembourg</mdui:Description>
         <mdui:Keywords xml:lang="en">Uni.lu+login</mdui:Keywords>
-        <mdui:Logo height="78" width="73" xml:lang="en">https://id.uni.lu/uni.lu.png</mdui:Logo>
+        <mdui:Logo width="73" height="78" xml:lang="en">https://id.uni.lu/uni.lu.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:IPHint>158.64.76.0/16</mdui:IPHint>
diff --git a/swamid-interfederations-2.0/idem.mulino.it-module.php-saml-sp-metadata.php-mulino-sp.xml b/swamid-interfederations-2.0/idem.mulino.it-module.php-saml-sp-metadata.php-mulino-sp.xml
index f460c94a..5b3a9934 100644
--- a/swamid-interfederations-2.0/idem.mulino.it-module.php-saml-sp-metadata.php-mulino-sp.xml
+++ b/swamid-interfederations-2.0/idem.mulino.it-module.php-saml-sp-metadata.php-mulino-sp.xml
@@ -100,7 +100,6 @@ gDj9yuSzmw==
       <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md: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>
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..896d5df9
--- /dev/null
+++ b/swamid-interfederations-2.0/idem.unisalento.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:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.unisalento.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisalento.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Salento</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università del Salento</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for the users of University of Salento</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università del Salento</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://idem-idp.unisalento.it/info</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://idem-idp.unisalento.it/infoeng/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://idem-idp.unisalento.it/info</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://idem-idp.unisalento.it/infoeng/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+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 Salento</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università del Salento</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Salento</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unisalento.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://international.unisalento.it/about</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Antonio Campa</md:SurName>
+    <md:EmailAddress>mailto:dorsale@unisalento.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml
index 382c314c..b498370b 100644
--- a/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idemfero.units.it/idp/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-10-11T15:00:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-10-11T13:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">units.it</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ds.units.it</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Trieste IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Trieste IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Trieste</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Trieste</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity Provider for University of Trieste members</mdui:Description>
         <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Trieste</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://international.units.it/</mdui:InformationURL>
@@ -21,6 +21,19 @@
         <mdui:Logo height="60" width="80" xml:lang="en">https://idemfero.units.it/unilogo/sigillo60x80.png</mdui:Logo>
         <mdui:Logo height="60" width="80" xml:lang="it">https://idemfero.units.it/unilogo/sigillo60x80.png</mdui:Logo>
       </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:45.659111,13.793918</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.654776,13.774515</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.644968,13.763675</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.645326,13.761110</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.643376,13.758256</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.625536,13.794341</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.939804,13.631546</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.774583,12.835801</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.952193,12.680840</mdui:GeolocationHint>
+        <mdui:DomainHint>units.it</mdui:DomainHint>
+        <mdui:DomainHint>univ.trieste.it</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -57,7 +70,7 @@ aQYbJQ==
     <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:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">units.it</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ds.units.it</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml b/swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml
index 703b00b0..3c3a1b77 100644
--- a/swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml
@@ -10,10 +10,12 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">groupe-esa.com</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">groupe-esa.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Ecole Supérieure d'Agriculture d'Angers</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB70lEQVQoz4VRTWsTURQ9b/Iy+eikmZmYNm21mkK0YI0J2toiQt3WZVGQLhSX1oUb0T/gQlyISxFRFyLoQrqpC7spaotJaqjVIJgItipqPiYxzYcz8zIung1DtHhX5957zr3nvkcmnvYPdg0BMFpG3dzU9ELh13cAAETBRQjBVpgtg1mMdjtlo2VQgQZcPcP+aJPV5zYeAHAQR2qq4KVSW3Drw7Xr767QbDWDf0XEt9/OBhBTjgAQsE3E1QkOHn+6863xGcAB+TAB2VYQU8c5uJe7mSw+B+ClkiwG/rOhwWrZauZteYUXg+6QIAquv9l+pxKW9gJY01LMYm1Bj7uPzoTPHw+dSBVfpEvLS/kFZjHuh4AAWNUSADKVtAWLgOxwhYS7uRuzielsNTM9ePbJZHK4Owogpvw5YFV7BaBqVNZrOQCyqAo8n//y6GLq9IXEyavx2/Yn4hsAcFcEhNqtr9dyFb0ki+pBZYxX7h99xoEqBjmgHec2W42Ib8Tn9PN0SNrXQegUDHh275EiHG/UPpb0fLsVVcY6BVMDp97/fBPf+rLL6XOJwmK7Oze5AoCOyId2esOKGIip46oYvPT6zMNjiwCYZa5pSfu4l/kFAGR0Ptjr7m+welkvlvUSgD7PLgJiWuaP5le7wOPoEojwG6Syr579qdfjAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjU4KzAyOjAwQPXpCwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODo1OCswMjowMDGoUbcAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Higher School of Agriculture of Angers - France</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKTWlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVN3WJP3Fj7f92UPVkLY8LGXbIEAIiOsCMgQWaIQkgBhhBASQMWFiApWFBURnEhVxILVCkidiOKgKLhnQYqIWotVXDjuH9yntX167+3t+9f7vOec5/zOec8PgBESJpHmomoAOVKFPDrYH49PSMTJvYACFUjgBCAQ5svCZwXFAADwA3l4fnSwP/wBr28AAgBw1S4kEsfh/4O6UCZXACCRAOAiEucLAZBSAMguVMgUAMgYALBTs2QKAJQAAGx5fEIiAKoNAOz0ST4FANipk9wXANiiHKkIAI0BAJkoRyQCQLsAYFWBUiwCwMIAoKxAIi4EwK4BgFm2MkcCgL0FAHaOWJAPQGAAgJlCLMwAIDgCAEMeE80DIEwDoDDSv+CpX3CFuEgBAMDLlc2XS9IzFLiV0Bp38vDg4iHiwmyxQmEXKRBmCeQinJebIxNI5wNMzgwAABr50cH+OD+Q5+bk4eZm52zv9MWi/mvwbyI+IfHf/ryMAgQAEE7P79pf5eXWA3DHAbB1v2upWwDaVgBo3/ldM9sJoFoK0Hr5i3k4/EAenqFQyDwdHAoLC+0lYqG9MOOLPv8z4W/gi372/EAe/tt68ABxmkCZrcCjg/1xYW52rlKO58sEQjFu9+cj/seFf/2OKdHiNLFcLBWK8ViJuFAiTcd5uVKRRCHJleIS6X8y8R+W/QmTdw0ArIZPwE62B7XLbMB+7gECiw5Y0nYAQH7zLYwaC5EAEGc0Mnn3AACTv/mPQCsBAM2XpOMAALzoGFyolBdMxggAAESggSqwQQcMwRSswA6cwR28wBcCYQZEQAwkwDwQQgbkgBwKoRiWQRlUwDrYBLWwAxqgEZrhELTBMTgN5+ASXIHrcBcGYBiewhi8hgkEQcgIE2EhOogRYo7YIs4IF5mOBCJhSDSSgKQg6YgUUSLFyHKkAqlCapFdSCPyLXIUOY1cQPqQ28ggMor8irxHMZSBslED1AJ1QLmoHxqKxqBz0XQ0D12AlqJr0Rq0Hj2AtqKn0UvodXQAfYqOY4DRMQ5mjNlhXIyHRWCJWBomxxZj5Vg1Vo81Yx1YN3YVG8CeYe8IJAKLgBPsCF6EEMJsgpCQR1hMWEOoJewjtBK6CFcJg4Qxwicik6hPtCV6EvnEeGI6sZBYRqwm7iEeIZ4lXicOE1+TSCQOyZLkTgohJZAySQtJa0jbSC2kU6Q+0hBpnEwm65Btyd7kCLKArCCXkbeQD5BPkvvJw+S3FDrFiOJMCaIkUqSUEko1ZT/lBKWfMkKZoKpRzame1AiqiDqfWkltoHZQL1OHqRM0dZolzZsWQ8ukLaPV0JppZ2n3aC/pdLoJ3YMeRZfQl9Jr6Afp5+mD9HcMDYYNg8dIYigZaxl7GacYtxkvmUymBdOXmchUMNcyG5lnmA+Yb1VYKvYqfBWRyhKVOpVWlX6V56pUVXNVP9V5qgtUq1UPq15WfaZGVbNQ46kJ1Bar1akdVbupNq7OUndSj1DPUV+jvl/9gvpjDbKGhUaghkijVGO3xhmNIRbGMmXxWELWclYD6yxrmE1iW7L57Ex2Bfsbdi97TFNDc6pmrGaRZp3mcc0BDsax4PA52ZxKziHODc57LQMtPy2x1mqtZq1+rTfaetq+2mLtcu0W7eva73VwnUCdLJ31Om0693UJuja6UbqFutt1z+o+02PreekJ9cr1Dund0Uf1bfSj9Rfq79bv0R83MDQINpAZbDE4Y/DMkGPoa5hpuNHwhOGoEctoupHEaKPRSaMnuCbuh2fjNXgXPmasbxxirDTeZdxrPGFiaTLbpMSkxeS+Kc2Ua5pmutG003TMzMgs3KzYrMnsjjnVnGueYb7ZvNv8jYWlRZzFSos2i8eW2pZ8ywWWTZb3rJhWPlZ5VvVW16xJ1lzrLOtt1ldsUBtXmwybOpvLtqitm63Edptt3xTiFI8p0in1U27aMez87ArsmuwG7Tn2YfYl9m32zx3MHBId1jt0O3xydHXMdmxwvOuk4TTDqcSpw+lXZxtnoXOd8zUXpkuQyxKXdpcXU22niqdun3rLleUa7rrStdP1o5u7m9yt2W3U3cw9xX2r+00umxvJXcM970H08PdY4nHM452nm6fC85DnL152Xlle+70eT7OcJp7WMG3I28Rb4L3Le2A6Pj1l+s7pAz7GPgKfep+Hvqa+It89viN+1n6Zfgf8nvs7+sv9j/i/4XnyFvFOBWABwQHlAb2BGoGzA2sDHwSZBKUHNQWNBbsGLww+FUIMCQ1ZH3KTb8AX8hv5YzPcZyya0RXKCJ0VWhv6MMwmTB7WEY6GzwjfEH5vpvlM6cy2CIjgR2yIuB9pGZkX+X0UKSoyqi7qUbRTdHF09yzWrORZ+2e9jvGPqYy5O9tqtnJ2Z6xqbFJsY+ybuIC4qriBeIf4RfGXEnQTJAntieTE2MQ9ieNzAudsmjOc5JpUlnRjruXcorkX5unOy553PFk1WZB8OIWYEpeyP+WDIEJQLxhP5aduTR0T8oSbhU9FvqKNolGxt7hKPJLmnVaV9jjdO31D+miGT0Z1xjMJT1IreZEZkrkj801WRNberM/ZcdktOZSclJyjUg1plrQr1zC3KLdPZisrkw3keeZtyhuTh8r35CP5c/PbFWyFTNGjtFKuUA4WTC+oK3hbGFt4uEi9SFrUM99m/ur5IwuCFny9kLBQuLCz2Lh4WfHgIr9FuxYji1MXdy4xXVK6ZHhp8NJ9y2jLspb9UOJYUlXyannc8o5Sg9KlpUMrglc0lamUycturvRauWMVYZVkVe9ql9VbVn8qF5VfrHCsqK74sEa45uJXTl/VfPV5bdra3kq3yu3rSOuk626s91m/r0q9akHV0IbwDa0b8Y3lG19tSt50oXpq9Y7NtM3KzQM1YTXtW8y2rNvyoTaj9nqdf13LVv2tq7e+2Sba1r/dd3vzDoMdFTve75TsvLUreFdrvUV99W7S7oLdjxpiG7q/5n7duEd3T8Wej3ulewf2Re/ranRvbNyvv7+yCW1SNo0eSDpw5ZuAb9qb7Zp3tXBaKg7CQeXBJ9+mfHvjUOihzsPcw83fmX+39QjrSHkr0jq/dawto22gPaG97+iMo50dXh1Hvrf/fu8x42N1xzWPV56gnSg98fnkgpPjp2Snnp1OPz3Umdx590z8mWtdUV29Z0PPnj8XdO5Mt1/3yfPe549d8Lxw9CL3Ytslt0utPa49R35w/eFIr1tv62X3y+1XPK509E3rO9Hv03/6asDVc9f41y5dn3m978bsG7duJt0cuCW69fh29u0XdwruTNxdeo94r/y+2v3qB/oP6n+0/rFlwG3g+GDAYM/DWQ/vDgmHnv6U/9OH4dJHzEfVI0YjjY+dHx8bDRq98mTOk+GnsqcTz8p+Vv9563Or59/94vtLz1j82PAL+YvPv655qfNy76uprzrHI8cfvM55PfGm/K3O233vuO+638e9H5ko/ED+UPPR+mPHp9BP9z7nfP78L/eE8/sl0p8zAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAADPUlEQVR42lSTTWhcVRiG3+8759x7Z+7MJLGJiXY0Bit040IKRTGSRheKoIlLKaIbEUEXClpFqYKg2JVQY0GKllpUsFJQpCsbFG2tiG1EoSpICRp1Jun83bn3zj33nM+FFfXZv8+zeunshSUQG3gRGM7wSWs39v+wDB3I3QQcApOzFD+8P33r0xf88RuT+OrnTS3uStZ+zufdTY3/IEII2QJEMYrskJigDg4CCFYi2EVvRx/74easpxRSpk1A7vlHMAZguQSvXxO0VoPhHztKMtcy8zxYVWDU+9Pl5ks2Kya9HSw5yppk1IqKG7czEcUEnCSiI07CU3Nx+/65WmvgOQKc2+uKcm3WXrxh3q7tsp5XIPQRmN/gMPqMq/G9PBh2HylsfouIvG5UdKau04NLM+d6lGVnUZaPCtS300VroYktwKjPmQHdaEDFtdMQzPFw2H8ozXqviM8f92V/IRlcou3653mOgzsliI6Slub3ZsfRH+Wq2WpVSh0AknThBpdaYvMJjqrxjFZmN7M/lmVbh7O04y8k259xlclnKTAPMtHeVMX1DdrW0Eb2iCshtgRELkqRj+lSSg5VcAfEIx1ZBKIQ6rIHO9oH8l+RCRogY9tm6hh8+SS8+g5EObF7gExQ1xvtpGhU3YvNqcZJWzryhUPVbWWw+QmE4QkkPSCOzvRV7Wlkw5uJ6+8SGERVsC1+0UQ4J+QXO2lywHmfFYVD0W9DV9WyOPcY9TqAqR94b+K+zT3r39x1ffLTPjUdFglqq6NReZ4+/HL3IpGcMoa2kqTo2n6HvmjvfPvw5Dsv+yL3ZEeQSqxh6mGl7Kmb+mspRab8M7iSUwSsBVhd/633RKDVU1leTrp+hqGZnPIczyDihlRqBPEJfD6Rqao+fcUCQ5BAXA2QLU0E5CP32qA7epOZTdotwNvKAqQArwIIBFAVAAlEBpCsAkADSAGkDABEBGZKidArOepdF36d3eYPjiKkLkLHROiEMVpQyGPAABB9WaL+dyaIQE2F4IYfW/QrM7tw3BLECmjLIG+kmHAf8Ku/trATQAEA4H/HAEKGHlfwXuUAJePYqI3hdzuODV1FxzWxlt8qRy7H/+avAQCLc5f/0myqcgAAAABJRU5ErkJggg==</mdui:Logo>
         <mdui:InformationURL xml:lang="fr">http://www.groupe-esa.com/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Identity Federation server for employees and students at ESA</mdui:Description>
         <mdui:DisplayName xml:lang="fr">Ecole Supérieure d'Agriculture d'Angers</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Serveur de Fédération d'identités pour le personnel et les étudiants du Groupe ESA</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml b/swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml
index 25ded13a..38395535 100644
--- a/swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml
+++ b/swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml
@@ -79,8 +79,8 @@ Dj+RBXEEXq6BPJ4ZI/vQ8DB6K34mTzfQKg==
       <md:ServiceDescription xml:lang="fr">Cette plate-forme permet aux responsables de communication de charger les éléments d'identification numérique</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">This platform allows the responsables of the communication to load digital identification elements they need</md:ServiceDescription>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="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>
diff --git a/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml
index 3514ec6e..cc6885f0 100644
--- a/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml
@@ -16,8 +16,8 @@
         <mdui:InformationURL xml:lang="sv">http://www.mdh.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.mdh.se</mdui:InformationURL>
         <mdui:Logo height="117" width="216">https://identity.mdh.se/img/logo-sv.png</mdui:Logo>
-        <mdui:Logo height="117" width="216" xml:lang="sv">https://identity.mdh.se/img/logo-sv.png</mdui:Logo>
-        <mdui:Logo height="117" width="216" xml:lang="en">https://identity.mdh.se/img/logo-en.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="117" width="216">https://identity.mdh.se/img/logo-sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="117" width="216">https://identity.mdh.se/img/logo-en.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
         <mdui:Keywords xml:lang="en">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml
index ec8abe54..9614dbd9 100644
--- a/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml
@@ -9,10 +9,10 @@
     <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">genci.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">GENCI</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">RENATER Connect</mdui:DisplayName>
         <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
         <mdui:Description xml:lang="en">IdP Hosting</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">GENCI</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">RENATER Connect</mdui:DisplayName>
         <mdui:Description xml:lang="fr">IdP Hosting</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
@@ -83,8 +83,8 @@ eTynT1A7tmOPmxyMyv76cficIt0xGao=
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">GENCI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GENCI</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">RENATER Connect</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RENATER Connect</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml
index 79007840..99fc1912 100644
--- a/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml
@@ -84,9 +84,9 @@ iVr4j+vsHmoBJB+J5VAC8/SAzG/s4VDMBZ2yqMvzeEXkmaOTrso=
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-prod.cc.ucf.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-prod.cc.ucf.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-prod.cc.ucf.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-prod.cc.ucf.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-prod.cc.ucf.edu/idp/profile/Shibboleth/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-prod.cc.ucf.edu/idp/profile/SAML2/Redirect/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-prod.cc.ucf.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-prod.cc.ucf.edu/idp/profile/SAML2/POST/SSO"/>
   </md:IDPSSODescriptor>
   <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
diff --git a/swamid-interfederations-2.0/idp-v2.konstfack.se-adfs-services-trust.xml b/swamid-interfederations-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
new file mode 100644
index 00000000..d6c1f04d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
@@ -0,0 +1,729 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-v2.konstfack.se/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">konstfack.se</shibmd:Scope>
+  </md:Extensions>
+  <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp-v2.konstfack.se">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <fed:ClaimTypesRequested>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
+        <auth:DisplayName>E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
+        <auth:DisplayName>Given Name</auth:DisplayName>
+        <auth:Description>The given name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
+        <auth:DisplayName>Name</auth:DisplayName>
+        <auth:Description>The unique name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
+        <auth:DisplayName>UPN</auth:DisplayName>
+        <auth:Description>The user principal name (UPN) of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
+        <auth:DisplayName>Common Name</auth:DisplayName>
+        <auth:Description>The common name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
+        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
+        <auth:DisplayName>Group</auth:DisplayName>
+        <auth:Description>A group that the user is a member of</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
+        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
+        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
+        <auth:DisplayName>Role</auth:DisplayName>
+        <auth:Description>A role that the user has</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
+        <auth:DisplayName>Surname</auth:DisplayName>
+        <auth:Description>The surname of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
+        <auth:DisplayName>PPID</auth:DisplayName>
+        <auth:Description>The private identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
+        <auth:DisplayName>Name ID</auth:DisplayName>
+        <auth:Description>The SAML name identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
+        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
+        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
+        <auth:DisplayName>Authentication method</auth:DisplayName>
+        <auth:Description>The method used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
+        <auth:DisplayName>Deny only group SID</auth:DisplayName>
+        <auth:Description>The deny-only group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
+        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
+        <auth:Description>The deny-only primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
+        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
+        <auth:Description>The deny-only primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
+        <auth:DisplayName>Group SID</auth:DisplayName>
+        <auth:Description>The group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
+        <auth:DisplayName>Primary group SID</auth:DisplayName>
+        <auth:Description>The primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
+        <auth:DisplayName>Primary SID</auth:DisplayName>
+        <auth:Description>The primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
+        <auth:DisplayName>Windows account name</auth:DisplayName>
+        <auth:Description>The domain account name of the user in the form of domain\user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" Optional="true">
+        <auth:DisplayName>Is Registered User</auth:DisplayName>
+        <auth:Description>User is registered to use this device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" Optional="true">
+        <auth:DisplayName>Device Identifier</auth:DisplayName>
+        <auth:Description>Identifier of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" Optional="true">
+        <auth:DisplayName>Device Registration Identifier</auth:DisplayName>
+        <auth:Description>Identifier for Device Registration</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" Optional="true">
+        <auth:DisplayName>Device Registration DisplayName</auth:DisplayName>
+        <auth:Description>Display name of Device Registration</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" Optional="true">
+        <auth:DisplayName>Device OS type</auth:DisplayName>
+        <auth:Description>OS type of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" Optional="true">
+        <auth:DisplayName>Device OS Version</auth:DisplayName>
+        <auth:Description>OS version of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" Optional="true">
+        <auth:DisplayName>Is Managed Device</auth:DisplayName>
+        <auth:Description>Device is managed by a management service</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" Optional="true">
+        <auth:DisplayName>Forwarded Client IP</auth:DisplayName>
+        <auth:Description>IP address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" Optional="true">
+        <auth:DisplayName>Client Application</auth:DisplayName>
+        <auth:Description>Type of the Client Application</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" Optional="true">
+        <auth:DisplayName>Client User Agent</auth:DisplayName>
+        <auth:Description>Device type the client is using to access the application</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" Optional="true">
+        <auth:DisplayName>Client IP</auth:DisplayName>
+        <auth:Description>IP address of the client</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" Optional="true">
+        <auth:DisplayName>Endpoint Path</auth:DisplayName>
+        <auth:Description>Absolute Endpoint path which can be used to determine active versus passive clients</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" Optional="true">
+        <auth:DisplayName>Proxy</auth:DisplayName>
+        <auth:Description>DNS name of the federation server proxy that passed the request</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" Optional="true">
+        <auth:DisplayName>Application Identifier</auth:DisplayName>
+        <auth:Description>Identifier for the Relying Party</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" Optional="true">
+        <auth:DisplayName>Application policies</auth:DisplayName>
+        <auth:Description>Application policies of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" Optional="true">
+        <auth:DisplayName>Authority Key Identifier</auth:DisplayName>
+        <auth:Description>The Authority Key Identifier extension of the certificate that signed an issued certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" Optional="true">
+        <auth:DisplayName>Basic Constraint</auth:DisplayName>
+        <auth:Description>One of the basic constraints of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" Optional="true">
+        <auth:DisplayName>Enhanced Key Usage</auth:DisplayName>
+        <auth:Description>Describes one of the enhanced key usages of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" Optional="true">
+        <auth:DisplayName>Issuer</auth:DisplayName>
+        <auth:Description>The name of the certificate authority that issued the X.509 certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" Optional="true">
+        <auth:DisplayName>Issuer Name</auth:DisplayName>
+        <auth:Description>The distinguished name of the certificate issuer</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" Optional="true">
+        <auth:DisplayName>Key Usage</auth:DisplayName>
+        <auth:Description>One of the key usages of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" Optional="true">
+        <auth:DisplayName>Not After</auth:DisplayName>
+        <auth:Description>Date in local time after which a certificate is no longer valid</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" Optional="true">
+        <auth:DisplayName>Not Before</auth:DisplayName>
+        <auth:Description>The date in local time on which a certificate becomes valid</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" Optional="true">
+        <auth:DisplayName>Certificate Policies</auth:DisplayName>
+        <auth:Description>The policies under which the certificate has been issued</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" Optional="true">
+        <auth:DisplayName>Public Key</auth:DisplayName>
+        <auth:Description>Public Key of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" Optional="true">
+        <auth:DisplayName>Certificate Raw Data</auth:DisplayName>
+        <auth:Description>The raw data of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" Optional="true">
+        <auth:DisplayName>Subject Alternative Name</auth:DisplayName>
+        <auth:Description>One of the alternative names of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" Optional="true">
+        <auth:DisplayName>Serial Number</auth:DisplayName>
+        <auth:Description>The serial number of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" Optional="true">
+        <auth:DisplayName>Signature Algorithm</auth:DisplayName>
+        <auth:Description>The algorithm used to create the signature of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" Optional="true">
+        <auth:DisplayName>Subject</auth:DisplayName>
+        <auth:Description>The subject from the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" Optional="true">
+        <auth:DisplayName>Subject Key Identifier</auth:DisplayName>
+        <auth:Description>Describes the subject key identifier of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" Optional="true">
+        <auth:DisplayName>Subject Name</auth:DisplayName>
+        <auth:Description>The subject distinguished name from a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" Optional="true">
+        <auth:DisplayName>V2 Template Name</auth:DisplayName>
+        <auth:Description>The name of the version 2 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" Optional="true">
+        <auth:DisplayName>V1 Template Name</auth:DisplayName>
+        <auth:Description>The name of the version 1 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" Optional="true">
+        <auth:DisplayName>Thumbprint</auth:DisplayName>
+        <auth:Description>Thumbprint of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" Optional="true">
+        <auth:DisplayName>X.509 Version</auth:DisplayName>
+        <auth:Description>The X.509 format version of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" Optional="true">
+        <auth:DisplayName>Inside Corporate Network</auth:DisplayName>
+        <auth:Description>Used to indicate if a request originated inside corporate network</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" Optional="true">
+        <auth:DisplayName>Password Expiration Time</auth:DisplayName>
+        <auth:Description>Used to display the time when the password expires</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" Optional="true">
+        <auth:DisplayName>Password Expiration Days</auth:DisplayName>
+        <auth:Description>Used to display the number of days to password expiry</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" Optional="true">
+        <auth:DisplayName>Update Password URL</auth:DisplayName>
+        <auth:Description>Used to display the web address of update password service</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/claims/authnmethodsreferences" Optional="true">
+        <auth:DisplayName>Authentication Methods References</auth:DisplayName>
+        <auth:Description>Used to indicate all authentication methods used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" Optional="true">
+        <auth:DisplayName>Client Request ID</auth:DisplayName>
+        <auth:Description>Identifier for a user session</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2013/11/alternateloginid" Optional="true">
+        <auth:DisplayName>Alternate Login ID</auth:DisplayName>
+        <auth:Description>Alternate login ID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/employeeID" Optional="true">
+        <auth:DisplayName>employeeID</auth:DisplayName>
+      </auth:ClaimType>
+    </fed:ClaimTypesRequested>
+    <fed:TargetScopes>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/ls/</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust</Address>
+      </EndpointReference>
+    </fed:TargetScopes>
+    <fed:ApplicationServiceEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+    </fed:ApplicationServiceEndpoint>
+    <fed:PassiveRequestorEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/ls/</Address>
+      </EndpointReference>
+    </fed:PassiveRequestorEndpoint>
+  </md:RoleDescriptor>
+  <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:SecurityTokenServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp-v2.konstfack.se">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <fed:TokenTypesOffered>
+      <fed:TokenType Uri="urn:oasis:names:tc:SAML:2.0:assertion"/>
+      <fed:TokenType Uri="urn:oasis:names:tc:SAML:1.0:assertion"/>
+    </fed:TokenTypesOffered>
+    <fed:ClaimTypesOffered>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
+        <auth:DisplayName>E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
+        <auth:DisplayName>Given Name</auth:DisplayName>
+        <auth:Description>The given name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
+        <auth:DisplayName>Name</auth:DisplayName>
+        <auth:Description>The unique name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
+        <auth:DisplayName>UPN</auth:DisplayName>
+        <auth:Description>The user principal name (UPN) of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
+        <auth:DisplayName>Common Name</auth:DisplayName>
+        <auth:Description>The common name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
+        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
+        <auth:DisplayName>Group</auth:DisplayName>
+        <auth:Description>A group that the user is a member of</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
+        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
+        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
+        <auth:DisplayName>Role</auth:DisplayName>
+        <auth:Description>A role that the user has</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
+        <auth:DisplayName>Surname</auth:DisplayName>
+        <auth:Description>The surname of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
+        <auth:DisplayName>PPID</auth:DisplayName>
+        <auth:Description>The private identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
+        <auth:DisplayName>Name ID</auth:DisplayName>
+        <auth:Description>The SAML name identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
+        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
+        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
+        <auth:DisplayName>Authentication method</auth:DisplayName>
+        <auth:Description>The method used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
+        <auth:DisplayName>Deny only group SID</auth:DisplayName>
+        <auth:Description>The deny-only group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
+        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
+        <auth:Description>The deny-only primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
+        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
+        <auth:Description>The deny-only primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
+        <auth:DisplayName>Group SID</auth:DisplayName>
+        <auth:Description>The group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
+        <auth:DisplayName>Primary group SID</auth:DisplayName>
+        <auth:Description>The primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
+        <auth:DisplayName>Primary SID</auth:DisplayName>
+        <auth:Description>The primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
+        <auth:DisplayName>Windows account name</auth:DisplayName>
+        <auth:Description>The domain account name of the user in the form of domain\user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" Optional="true">
+        <auth:DisplayName>Is Registered User</auth:DisplayName>
+        <auth:Description>User is registered to use this device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" Optional="true">
+        <auth:DisplayName>Device Identifier</auth:DisplayName>
+        <auth:Description>Identifier of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" Optional="true">
+        <auth:DisplayName>Device Registration Identifier</auth:DisplayName>
+        <auth:Description>Identifier for Device Registration</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" Optional="true">
+        <auth:DisplayName>Device Registration DisplayName</auth:DisplayName>
+        <auth:Description>Display name of Device Registration</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" Optional="true">
+        <auth:DisplayName>Device OS type</auth:DisplayName>
+        <auth:Description>OS type of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" Optional="true">
+        <auth:DisplayName>Device OS Version</auth:DisplayName>
+        <auth:Description>OS version of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" Optional="true">
+        <auth:DisplayName>Is Managed Device</auth:DisplayName>
+        <auth:Description>Device is managed by a management service</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" Optional="true">
+        <auth:DisplayName>Forwarded Client IP</auth:DisplayName>
+        <auth:Description>IP address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" Optional="true">
+        <auth:DisplayName>Client Application</auth:DisplayName>
+        <auth:Description>Type of the Client Application</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" Optional="true">
+        <auth:DisplayName>Client User Agent</auth:DisplayName>
+        <auth:Description>Device type the client is using to access the application</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" Optional="true">
+        <auth:DisplayName>Client IP</auth:DisplayName>
+        <auth:Description>IP address of the client</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" Optional="true">
+        <auth:DisplayName>Endpoint Path</auth:DisplayName>
+        <auth:Description>Absolute Endpoint path which can be used to determine active versus passive clients</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" Optional="true">
+        <auth:DisplayName>Proxy</auth:DisplayName>
+        <auth:Description>DNS name of the federation server proxy that passed the request</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" Optional="true">
+        <auth:DisplayName>Application Identifier</auth:DisplayName>
+        <auth:Description>Identifier for the Relying Party</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" Optional="true">
+        <auth:DisplayName>Application policies</auth:DisplayName>
+        <auth:Description>Application policies of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" Optional="true">
+        <auth:DisplayName>Authority Key Identifier</auth:DisplayName>
+        <auth:Description>The Authority Key Identifier extension of the certificate that signed an issued certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" Optional="true">
+        <auth:DisplayName>Basic Constraint</auth:DisplayName>
+        <auth:Description>One of the basic constraints of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" Optional="true">
+        <auth:DisplayName>Enhanced Key Usage</auth:DisplayName>
+        <auth:Description>Describes one of the enhanced key usages of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" Optional="true">
+        <auth:DisplayName>Issuer</auth:DisplayName>
+        <auth:Description>The name of the certificate authority that issued the X.509 certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" Optional="true">
+        <auth:DisplayName>Issuer Name</auth:DisplayName>
+        <auth:Description>The distinguished name of the certificate issuer</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" Optional="true">
+        <auth:DisplayName>Key Usage</auth:DisplayName>
+        <auth:Description>One of the key usages of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" Optional="true">
+        <auth:DisplayName>Not After</auth:DisplayName>
+        <auth:Description>Date in local time after which a certificate is no longer valid</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" Optional="true">
+        <auth:DisplayName>Not Before</auth:DisplayName>
+        <auth:Description>The date in local time on which a certificate becomes valid</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" Optional="true">
+        <auth:DisplayName>Certificate Policies</auth:DisplayName>
+        <auth:Description>The policies under which the certificate has been issued</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" Optional="true">
+        <auth:DisplayName>Public Key</auth:DisplayName>
+        <auth:Description>Public Key of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" Optional="true">
+        <auth:DisplayName>Certificate Raw Data</auth:DisplayName>
+        <auth:Description>The raw data of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" Optional="true">
+        <auth:DisplayName>Subject Alternative Name</auth:DisplayName>
+        <auth:Description>One of the alternative names of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" Optional="true">
+        <auth:DisplayName>Serial Number</auth:DisplayName>
+        <auth:Description>The serial number of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" Optional="true">
+        <auth:DisplayName>Signature Algorithm</auth:DisplayName>
+        <auth:Description>The algorithm used to create the signature of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" Optional="true">
+        <auth:DisplayName>Subject</auth:DisplayName>
+        <auth:Description>The subject from the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" Optional="true">
+        <auth:DisplayName>Subject Key Identifier</auth:DisplayName>
+        <auth:Description>Describes the subject key identifier of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" Optional="true">
+        <auth:DisplayName>Subject Name</auth:DisplayName>
+        <auth:Description>The subject distinguished name from a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" Optional="true">
+        <auth:DisplayName>V2 Template Name</auth:DisplayName>
+        <auth:Description>The name of the version 2 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" Optional="true">
+        <auth:DisplayName>V1 Template Name</auth:DisplayName>
+        <auth:Description>The name of the version 1 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" Optional="true">
+        <auth:DisplayName>Thumbprint</auth:DisplayName>
+        <auth:Description>Thumbprint of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" Optional="true">
+        <auth:DisplayName>X.509 Version</auth:DisplayName>
+        <auth:Description>The X.509 format version of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" Optional="true">
+        <auth:DisplayName>Inside Corporate Network</auth:DisplayName>
+        <auth:Description>Used to indicate if a request originated inside corporate network</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" Optional="true">
+        <auth:DisplayName>Password Expiration Time</auth:DisplayName>
+        <auth:Description>Used to display the time when the password expires</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" Optional="true">
+        <auth:DisplayName>Password Expiration Days</auth:DisplayName>
+        <auth:Description>Used to display the number of days to password expiry</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" Optional="true">
+        <auth:DisplayName>Update Password URL</auth:DisplayName>
+        <auth:Description>Used to display the web address of update password service</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/claims/authnmethodsreferences" Optional="true">
+        <auth:DisplayName>Authentication Methods References</auth:DisplayName>
+        <auth:Description>Used to indicate all authentication methods used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" Optional="true">
+        <auth:DisplayName>Client Request ID</auth:DisplayName>
+        <auth:Description>Identifier for a user session</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2013/11/alternateloginid" Optional="true">
+        <auth:DisplayName>Alternate Login ID</auth:DisplayName>
+        <auth:Description>Alternate login ID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/employeeID" Optional="true">
+        <auth:DisplayName>employeeID</auth:DisplayName>
+      </auth:ClaimType>
+    </fed:ClaimTypesOffered>
+    <fed:SecurityTokenServiceEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/2005/certificatemixed</Address>
+        <Metadata>
+          <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex">
+            <wsx:MetadataSection xmlns="" Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex">
+              <wsx:MetadataReference>
+                <Address xmlns="http://www.w3.org/2005/08/addressing">https://idp-v2.konstfack.se/adfs/services/trust/mex</Address>
+              </wsx:MetadataReference>
+            </wsx:MetadataSection>
+          </Metadata>
+        </Metadata>
+      </EndpointReference>
+    </fed:SecurityTokenServiceEndpoint>
+    <fed:PassiveRequestorEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/ls/</Address>
+      </EndpointReference>
+    </fed:PassiveRequestorEndpoint>
+  </md:RoleDescriptor>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-v2.konstfack.se/adfs/ls/" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/" index="2"/>
+  </md:SPSSODescriptor>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">konstfack.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-v2.konstfack.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Registered User"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration DisplayName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS type"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS Version"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Managed Device"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Forwarded Client IP"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Application"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client User Agent"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client IP"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Endpoint Path"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Proxy"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application policies"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authority Key Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Basic Constraint"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Enhanced Key Usage"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Key Usage"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not After"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not Before"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Policies"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Public Key"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Raw Data"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Alternative Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Serial Number"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Signature Algorithm"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Key Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V2 Template Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V1 Template Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Thumbprint"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="X.509 Version"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Inside Corporate Network"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Time"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Days"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Update Password URL"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication Methods References"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Request ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2013/11/alternateloginid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Alternate Login ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/employeeID" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeID"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv-SE">Konstfack</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv-SE">Konstfack</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv-SE">http://www.konstfack.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Håkan</md:GivenName>
+    <md:SurName>Pettersson</md:SurName>
+    <md:EmailAddress>netsupport@konstfack.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-8-4504100</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
index c1eb5236..ffe0cfe7 100644
--- a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
+++ b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
@@ -100,7 +100,6 @@
       <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">hrusevec.si</shibmd:Scope>
@@ -418,6 +417,7 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jela-janezica.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slodrs.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostpavcka.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.ostpavcka.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-konjice-zrece.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cresnjevec.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssgt-mb.si</shibmd:Scope>
@@ -501,6 +501,7 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbicevje.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-otlica.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgrm.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.osgrm.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-toncke-cec.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-leskovec.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osobrinzi.si</shibmd:Scope>
@@ -524,6 +525,7 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vperka.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmedvode.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-velikapolana.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-velikapolana.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tonetacufarja.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tinje.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-tinje.si</shibmd:Scope>
@@ -541,6 +543,7 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-store.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osradlje.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">1os-zalec.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.1os-zalec.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ptrubar.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfpcrensovci.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-ravne.si</shibmd:Scope>
@@ -558,6 +561,37 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gasp.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgornjigrad.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osnovna-sola-polzela.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospisece.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ugm.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-rimsketoplice.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskaselj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osnhr.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-tolmin.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfara.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osnovnasolaprevole.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">podgoro.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osstaracerkev.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kungota.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrbovlje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-nazarje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solavitanje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-skofije.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-antonajanse.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrecica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">voranc.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbovec.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-razkrizje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">srednjasolaizola.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knjiznica-slovenskabistrica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zelenajama.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-stari-trg-ok.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-koprivnica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vransko.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfpkr.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjdol.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-malanedelja.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-montessori.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pei.si</shibmd:Scope>
       <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>
diff --git a/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
index 8e97b844..918903ce 100644
--- a/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
@@ -18,14 +18,14 @@
         <mdui:DisplayName xml:lang="en">Åbo Akademi University</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Åbo Akademi</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Åbo Akademi är Finlands svenskspråkiga universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Åbo Akademi is the Swedish language university in Turku, Finland</mdui:Description>
         <mdui:Description xml:lang="fi">Åbo Akademi on Turun ruotsinkielinen yliopisto</mdui:Description>
+        <mdui:Description xml:lang="en">Åbo Akademi is the Swedish language university in Turku, Finland</mdui:Description>
         <mdui:Logo height="325" width="314">https://web.abo.fi/dc/logo/aalogo-314x325.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">ÅA</mdui:Keywords>
         <mdui:Keywords xml:lang="en">ÅA</mdui:Keywords>
         <mdui:InformationURL xml:lang="fi">http://www.abo.fi/?lang=fi</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.abo.fi/?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>abo.fi</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml
index 76668f28..d54a51f0 100644
--- a/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml
@@ -17,8 +17,8 @@
         <mdui:DisplayName xml:lang="en">ACOnet staff</mdui:DisplayName>
         <mdui:Description xml:lang="de">Identity Provider des ACOnet-Teams</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for ACOnet staff</mdui:Description>
-        <mdui:Logo height="60" width="137">https://idp.aco.net/logos/137x60.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://eduid.at/style/aconet16x16.gif</mdui:Logo>
+        <mdui:Logo width="137" height="60">https://idp.aco.net/logos/137x60.gif</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://eduid.at/style/aconet16x16.gif</mdui:Logo>
         <mdui:InformationURL xml:lang="de">http://www.aco.net/organisation.html</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.aco.net/organisation.html?L=1</mdui:InformationURL>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml b/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml
index 001c29e5..c18ebc55 100644
--- a/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml
@@ -9,8 +9,8 @@
     <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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iuf.cpu.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">AMUE - Agence de Mutualisation des Universités et Etablissements</mdui:DisplayName>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACPUlEQVQoz0WSTWvcdRSFn/Ob/39eMi+ZaTohQZKmtJESg0VrKYgLa9d2IQWX0u9gsR+gq+7EhWtBUVzUna2LQsVli2CFSLEgpiZqdLQZZzLJvNzTxST1rB8u5977KCIEZhqDBEZS7OxN7v7Sffhkd/14+eLp1sJsCcg4pJ+jBoH/HcRH33c+3+j0O9393d6V1eaNd9bnm+V0NF1gW4CxYas3/nazNxxFMqOIOw+2bt/fNJGBpjCW5e3d4QGpVkqWQxEJW8mF3v7w8R//ycrAWEB/OL71w/aDv31iqf1SK7vQzt9aqn/WHQ9kK4oFWtUcOYGAvWF8eOena1/+SLXSNwO7WdL1C/Ofvr30ysnjM6VsrjFzbrWNU5JAvr+x8/HXj7qD+POfvsNyEqmcab1dO7e6uNyeffeNldfX5hGZHSZ9cu/RYDhJmb97uLn9tN9dnlurzZ0+lueKtVmffXPp0qlmXkgCxWTy607v8o1vfuuOD2qVVK81qqU0Uy7WK5dfbL5/fmGxWgDr8OgkxJPO3sEgQAGJMMkwmvDVz90vNjqAjj4FTuCD8WhijHAiku2kQshj69bjXcASxNSFZFK7XinmqcBEMokkwk4WxGAsHBCQpnzCrL4we2a5BZmFkGUcCMRKIxdJCJAkkSTKxcIHV15u1TOZUIAksBq5rq63pjBHSQKhV0/N3XzvtYtn2rnSdOmTzfza+YVLJ6rg/20GRQQIYhz+/en+xl+Dre5oppKdXaytNIrlfKraYSXgGXy1Bx0qBeYCAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE0KzAyOjAwAx+NhQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNCswMjowMHJCNTkAAAAASUVORK5CYII=</mdui:Logo>
diff --git a/swamid-interfederations-2.0/idp.aspete.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aspete.gr-idp-shibboleth.xml
new file mode 100644
index 00000000..f75969f6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.aspete.gr-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://idp.aspete.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aspete.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">School of Pedagogical and Technological Education</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Ανώτατη Σχολή Παιδαγωγικής και Τεχνολογικής Εκπαίδευσης</mdui:DisplayName>
+        <mdui:Description xml:lang="en">School of Pedagogical and Technological Education</mdui:Description>
+        <mdui:Description xml:lang="el">Ανώτατη Σχολή Παιδαγωγικής και Τεχνολογικής Εκπαίδευσης</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.aspete.gr/index.php/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.aspete.gr/index.php/el/</mdui:InformationURL>
+        <mdui:Logo height="304" width="304">https://www.aspete.gr/images/logos/aspaitelogoonly304x304trans.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="80" width="60">https://www.aspete.gr/images/logos/aspaitelogomoto82x60trans_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="el" height="80" width="60">https://www.aspete.gr/images/logos/aspaitelogomoto82x60trans_el.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="150" width="204">https://www.aspete.gr/images/logos/aspaitelogomoto204x150trans_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="el" height="150" width="204">https://www.aspete.gr/images/logos/aspaitelogomoto204x150trans_el.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="237" width="322">https://www.aspete.gr/images/logos/aspaitelogomoto322x237trans_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="el" height="237" width="322">https://www.aspete.gr/images/logos/aspaitelogomoto322x237trans_el.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>www.aspete.gr</mdui:DomainHint>
+        <mdui:DomainHint>elecengedu.aspete.gr</mdui:DomainHint>
+        <mdui:DomainHint>mechanical.aspete.gr</mdui:DomainHint>
+        <mdui:DomainHint>civil.aspete.gr</mdui:DomainHint>
+        <mdui:DomainHint>paidagogiko.aspete.gr</mdui:DomainHint>
+        <mdui:DomainHint>eppaikpesyp.aspete.gr</mdui:DomainHint>
+        <mdui:DomainHint>elke.aspete.gr</mdui:DomainHint>
+        <mdui:IPHint>83.212.12.64/26</mdui:IPHint>
+        <mdui:GeolocationHint>geo:38.0434378,23.7862765</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIEaDCCA1CgAwIBAgIRAKqJUe8UYbOGhgKO3vhgmRcwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDsxITAfBgNV
+                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwLmFzcGV0
+                            ZS5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeibmfLtvnVYXEm
+                            GcsY45goAhctgfl8AZvWmwUT2IV3jIgzOlP9GmBHXNj7FyW9hN9PbhrPU6ml2iOi
+                            xvzE6qHGwFwzrUA+ERqHGF7fLIY804WudIlFYGWJ0WTag/6d1jAifzlGambyFESq
+                            XnzNMPinV1Dwp2KbEoefKSJ9COnqpr4oZNYXa2cYyhoUmyLCzwoWis7rq6NzJ5lE
+                            lAqsEjfQZKe2LpcQve/yDkDPUHT7bdeZrY2HF9KlHUYejNWtRvsmgc9Iw3l70IAx
+                            YubwzfWiHzw5cMYrSP48tXMgt749SnveLsQqVt6lqWl1wG6RinU1vmkFf/S5fZKx
+                            luewDjUCAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+                            47ntMB0GA1UdDgQWBBQq3tzE0QEXd5xE2UV2oS+GFaCYuTAOBgNVHQ8BAf8EBAMC
+                            BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+                            IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
+                            oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
+                            bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
+                            bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
+                            dGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwLmFzcGV0ZS5ncjANBgkqhkiG
+                            9w0BAQUFAAOCAQEAw31uHFbO9pvY5vUd8/wrVWQfkt3MlP9kSmUacRoNCkU+mByt
+                            Wmoii6P+yrAoGMnDKdhGJDi/sKoL5KhW0R1EjHGX3NaYIyz7i4eTgjeZYsGEsEPK
+                            ZJbj1Jc2RYzfebkKKyoKaEOFebHfsFF14FJw417waGIJSEzwM4+rG8hUzK1MGK5S
+                            FXKapQiU6UGsbwltsLjUzvURalIf8mvAX26QGkUatjvTN0T31CfOw1RtVT1qVyuh
+                            C9LlTkZ8GVIF6HxcOiQNRzAft0mSGLEXqOpefOAAhs4GW0jDaphmYZHEJtKq3PTl
+                            w8LvrRCWWrxMJZ91O2tHn6HIrviKjXyakQ8GnA==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aspete.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aspete.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aspete.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aspete.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aspete.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aspete.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aspete.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIEaDCCA1CgAwIBAgIRAKqJUe8UYbOGhgKO3vhgmRcwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDsxITAfBgNV
+                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwLmFzcGV0
+                            ZS5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeibmfLtvnVYXEm
+                            GcsY45goAhctgfl8AZvWmwUT2IV3jIgzOlP9GmBHXNj7FyW9hN9PbhrPU6ml2iOi
+                            xvzE6qHGwFwzrUA+ERqHGF7fLIY804WudIlFYGWJ0WTag/6d1jAifzlGambyFESq
+                            XnzNMPinV1Dwp2KbEoefKSJ9COnqpr4oZNYXa2cYyhoUmyLCzwoWis7rq6NzJ5lE
+                            lAqsEjfQZKe2LpcQve/yDkDPUHT7bdeZrY2HF9KlHUYejNWtRvsmgc9Iw3l70IAx
+                            YubwzfWiHzw5cMYrSP48tXMgt749SnveLsQqVt6lqWl1wG6RinU1vmkFf/S5fZKx
+                            luewDjUCAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+                            47ntMB0GA1UdDgQWBBQq3tzE0QEXd5xE2UV2oS+GFaCYuTAOBgNVHQ8BAf8EBAMC
+                            BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+                            IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
+                            oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
+                            bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
+                            bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
+                            dGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwLmFzcGV0ZS5ncjANBgkqhkiG
+                            9w0BAQUFAAOCAQEAw31uHFbO9pvY5vUd8/wrVWQfkt3MlP9kSmUacRoNCkU+mByt
+                            Wmoii6P+yrAoGMnDKdhGJDi/sKoL5KhW0R1EjHGX3NaYIyz7i4eTgjeZYsGEsEPK
+                            ZJbj1Jc2RYzfebkKKyoKaEOFebHfsFF14FJw417waGIJSEzwM4+rG8hUzK1MGK5S
+                            FXKapQiU6UGsbwltsLjUzvURalIf8mvAX26QGkUatjvTN0T31CfOw1RtVT1qVyuh
+                            C9LlTkZ8GVIF6HxcOiQNRzAft0mSGLEXqOpefOAAhs4GW0jDaphmYZHEJtKq3PTl
+                            w8LvrRCWWrxMJZ91O2tHn6HIrviKjXyakQ8GnA==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aspete.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aspete.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">School of Pedagogical and Technological Education</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Ανώτατη Σχολή Παιδαγωγικής και Τεχνολογικής Εκπαίδευσης</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">School of Pedagogical and Technological Education</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Ανώτατη Σχολή Παιδαγωγικής και Τεχνολογικής Εκπαίδευσης</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aspete.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.aspete.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Apostolos</md:GivenName>
+    <md:SurName>Oikonomou</md:SurName>
+    <md:EmailAddress>apeco@aspete.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>School of Pedagogical and Technological Education NOC</md:Company>
+    <md:EmailAddress>noc@aspete.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml
deleted file mode 100644
index 0bf96500..00000000
--- a/swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.athukfed3.openathens.net/openathens">
-  <!--
-		This is an "athukfed3" OpenAthens MD Test IdP for Eduserv.
-	-->
-  <Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-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"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed3.openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net/ukfederation"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfederation"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed3.openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv athukfed3</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</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
deleted file mode 100644
index 5980e81a..00000000
--- a/swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.athukfed4.openathens.net/openathens">
-  <!--
-		This is an "athukfed4" OpenAthens MD Test IdP for Eduserv.
-	-->
-  <Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-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"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed4.openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net/ukfed/67475576"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfed/67475576"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed4.openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv athukfed4</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</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
deleted file mode 100644
index 9a6690e2..00000000
--- a/swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.athukfed5.openathens.net/openathens">
-  <!--
-		This is an "athukfed5" OpenAthens MD Test IdP for Eduserv.
-	-->
-  <Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-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"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed5.openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net/ukfed/67484437"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfed/67484437"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed5.openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv athukfed5</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml
index cebb76f5..52adbbe6 100644
--- a/swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml
@@ -14,7 +14,7 @@
         <mdui:DisplayName xml:lang="el">Οικονομικό Πανεπιστήμιο Αθηνών</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">http://www.aueb.gr/index_en.php</mdui:InformationURL>
         <mdui:InformationURL xml:lang="el">http://www.aueb.gr/</mdui:InformationURL>
-        <mdui:Logo height="83" width="83">https://idp.aueb.gr/logo.png</mdui:Logo>
+        <mdui:Logo width="83" height="83">https://idp.aueb.gr/logo.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:IPHint>195.251.248.0/21</mdui:IPHint>
diff --git a/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml
index 0021971d..ebc0a1d2 100644
--- a/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml
@@ -15,8 +15,8 @@
         <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: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>
diff --git a/swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml b/swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml
index 9570cb0b..c57234ca 100644
--- a/swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml
@@ -10,7 +10,7 @@
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </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:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp.chalmers.se">
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
@@ -19,87 +19,87 @@
       </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:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
         <auth:DisplayName>E-Mail Address</auth:DisplayName>
         <auth:Description>The e-mail address of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
         <auth:DisplayName>Given Name</auth:DisplayName>
         <auth:Description>The given name of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
         <auth:DisplayName>Name</auth:DisplayName>
         <auth:Description>The unique name of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
         <auth:DisplayName>UPN</auth:DisplayName>
         <auth:Description>The user principal name (UPN) of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/CommonName">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
         <auth:DisplayName>Common Name</auth:DisplayName>
         <auth:Description>The common name of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/EmailAddress">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
         <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
         <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/Group">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
         <auth:DisplayName>Group</auth:DisplayName>
         <auth:Description>A group that the user is a member of</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/UPN">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
         <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
         <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
         <auth:DisplayName>Role</auth:DisplayName>
         <auth:Description>A role that the user has</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
         <auth:DisplayName>Surname</auth:DisplayName>
         <auth:Description>The surname of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
         <auth:DisplayName>PPID</auth:DisplayName>
         <auth:Description>The private identifier of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
         <auth:DisplayName>Name ID</auth:DisplayName>
         <auth:Description>The SAML name identifier of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
         <auth:DisplayName>Authentication time stamp</auth:DisplayName>
         <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
         <auth:DisplayName>Authentication method</auth:DisplayName>
         <auth:Description>The method used to authenticate the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
         <auth:DisplayName>Deny only group SID</auth:DisplayName>
         <auth:Description>The deny-only group SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
         <auth:DisplayName>Deny only primary SID</auth:DisplayName>
         <auth:Description>The deny-only primary SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
         <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
         <auth:Description>The deny-only primary group SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
         <auth:DisplayName>Group SID</auth:DisplayName>
         <auth:Description>The group SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
         <auth:DisplayName>Primary group SID</auth:DisplayName>
         <auth:Description>The primary group SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
         <auth:DisplayName>Primary SID</auth:DisplayName>
         <auth:Description>The primary SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
         <auth:DisplayName>Windows account name</auth:DisplayName>
         <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
       </auth:ClaimType>
@@ -135,7 +135,7 @@
       </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:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:SecurityTokenServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp.chalmers.se">
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
@@ -155,87 +155,87 @@
       <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:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
         <auth:DisplayName>E-Mail Address</auth:DisplayName>
         <auth:Description>The e-mail address of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
         <auth:DisplayName>Given Name</auth:DisplayName>
         <auth:Description>The given name of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
         <auth:DisplayName>Name</auth:DisplayName>
         <auth:Description>The unique name of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
         <auth:DisplayName>UPN</auth:DisplayName>
         <auth:Description>The user principal name (UPN) of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/CommonName">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
         <auth:DisplayName>Common Name</auth:DisplayName>
         <auth:Description>The common name of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/EmailAddress">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
         <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
         <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/Group">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
         <auth:DisplayName>Group</auth:DisplayName>
         <auth:Description>A group that the user is a member of</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/UPN">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
         <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
         <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
         <auth:DisplayName>Role</auth:DisplayName>
         <auth:Description>A role that the user has</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
         <auth:DisplayName>Surname</auth:DisplayName>
         <auth:Description>The surname of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
         <auth:DisplayName>PPID</auth:DisplayName>
         <auth:Description>The private identifier of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
         <auth:DisplayName>Name ID</auth:DisplayName>
         <auth:Description>The SAML name identifier of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
         <auth:DisplayName>Authentication time stamp</auth:DisplayName>
         <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
         <auth:DisplayName>Authentication method</auth:DisplayName>
         <auth:Description>The method used to authenticate the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
         <auth:DisplayName>Deny only group SID</auth:DisplayName>
         <auth:Description>The deny-only group SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
         <auth:DisplayName>Deny only primary SID</auth:DisplayName>
         <auth:Description>The deny-only primary SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
         <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
         <auth:Description>The deny-only primary group SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
         <auth:DisplayName>Group SID</auth:DisplayName>
         <auth:Description>The group SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
         <auth:DisplayName>Primary group SID</auth:DisplayName>
         <auth:Description>The primary group SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
         <auth:DisplayName>Primary SID</auth:DisplayName>
         <auth:Description>The primary SID of the user</auth:Description>
       </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname">
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
         <auth:DisplayName>Windows account name</auth:DisplayName>
         <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
       </auth:ClaimType>
@@ -244,7 +244,7 @@
       <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">
+          <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex">
             <wsx:MetadataSection xmlns="" Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex">
               <wsx:MetadataReference>
                 <Address xmlns="http://www.w3.org/2005/08/addressing">https://idp.chalmers.se/adfs/services/trust/mex</Address>
@@ -337,27 +337,27 @@
     <md:NameIDFormat>urn:oasis:names: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"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
   </md:IDPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">CHALMERS</md:OrganizationName>
diff --git a/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml
index 141e9761..674177f5 100644
--- a/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml
@@ -102,8 +102,7 @@
     <EmailAddress>mailto:helpdesk@chesterfield.ac.uk</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Houghton</SurName>
-    <EmailAddress>mailto:houghtonr@chesterfield.ac.uk</EmailAddress>
+    <GivenName>Helpdesk</GivenName>
+    <EmailAddress>mailto:helpdesk@chesterfield.ac.uk</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-bordeaux.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-bordeaux.fr-idp-shibboleth.xml
index 216b3641..42215fe4 100644
--- a/swamid-interfederations-2.0/idp.crous-bordeaux.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-bordeaux.fr-idp-shibboleth.xml
@@ -7,8 +7,8 @@
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-bordeaux.local</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-bordeaux.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-bordeaux.local</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-test.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">CROUS Bordeaux</mdui:DisplayName>
diff --git a/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml
index c4b62475..2ed3a0da 100644
--- a/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cs.unicam.it/idp/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-04-09T15:00:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-04-09T12:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicam.it</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">University of Camerino</mdui:DisplayName>
         <mdui:DisplayName xml:lang="it">Università di Camerino</mdui:DisplayName>
@@ -18,33 +19,60 @@
         <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>
-MIID3zCCAsegAwIBAgIJAK8S/P0j6pHIMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJJVDERMA8GA1UEBwwIQ2FtZXJpbm8xGTAXBgNVBAoMEGlkcC5jcy51bmlj
-YW0uaXQxDzANBgNVBAsMBlVOSUNBTTEPMA0GA1UEAwwGVU5JQ0FNMSYwJAYJKoZI
-hvcNAQkBFhdtYXJjby5tYWNjYXJpQHVuaWNhbS5pdDAeFw0xNjAzMDcxMDAwMDda
-Fw00NjAyMjgxMDAwMDdaMIGFMQswCQYDVQQGEwJJVDERMA8GA1UEBwwIQ2FtZXJp
-bm8xGTAXBgNVBAoMEGlkcC5jcy51bmljYW0uaXQxDzANBgNVBAsMBlVOSUNBTTEP
-MA0GA1UEAwwGVU5JQ0FNMSYwJAYJKoZIhvcNAQkBFhdtYXJjby5tYWNjYXJpQHVu
-aWNhbS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANezKrkTEIyg
-1iLjYv99i/9Yfx34osPh3GwCylEyaO2TACLZbGd3xLfC3MI4FUWJbbyGFlDEPXpP
-aeAVGTRChjKN1GDHeE2yRNEjyxkp3hleuGTswQZIv56kUFVFFD6Dxp5/pSLoXXan
-V3fYxqri98koX5s6Jhm8Pb7dpbaG68JygxGgS4nUx5ccQn3n2E5cqq2Lg0XBp4Mu
-FB18gGncrtMnYKAY30ey/0vBcSt9DMDpsuMhTRqY49UJ1cR38AAxx26ogoO9fyty
-WtwX2aVFvwJiiSGpzK+eUZdza6LrU/i3D03uAumo1TFrcJ1tf/TEmGJeu+rG3zFy
-y7DgZBlUBFECAwEAAaNQME4wHQYDVR0OBBYEFFqip93yeZgp7DdIQTI0P5M8Ww/c
-MB8GA1UdIwQYMBaAFFqip93yeZgp7DdIQTI0P5M8Ww/cMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBALBlHlMBhe3Vw1Q8QMWRBMFpSN9r8vp0ve9pF1r7
-yCe4Rxk7PYe6gXJliISitm/w0mzO6zZ4fOh1H3PWKNPqXOQ920FyD453q/8gfI0P
-4So3erBawu1nTqR4WXIIUr16IiOup4pQqHmkSjfKSeGkvFR1c1fJ7vjCP4sUmSym
-4t2DftzTdlJYHXomcMf2V/hBiJc728KcjgUDc4FSl9vyCW5i6ftVyqYFKKoB0lCC
-RPhyOoywqlrl32bj8Pq29RqmIL7ZCWEmaoiXpyHOxvHdSIoFRAFs0RWX3/IMYuhf
-Dju2WmHxhbWhLCF5ZvJJqOHvdpzk+TJdQPVBuI6m6pH48MY=
+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:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDCTCCAfGgAwIBAgIJAODqdYOcRuvYMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMMEGlkcC5jcy51bmljYW0uaXQwHhcNMTYwMzI0MTExMTI0WhcNNDYwMzE3MTEx
+MTI0WjAbMRkwFwYDVQQDDBBpZHAuY3MudW5pY2FtLml0MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAx/kNUtQKUnqJJ0SreXDl743E0RRpe90AVYsJv0H2
+IT2Lmo8cM4AGNW6sHYBczRUc/caERx82hTZHg2/ZYJUElSz350oyE8kfIvxzNYzw
+6uLREdacMOaolFKJsw4W5PSoXLf9zTzdRTTDx0zo4GP28Ash4xS11VQMEpRxE/v4
+5qPiJiT6B2n1GeOtI1D5JeMUc4EvA/CIm2EBlXVkObrb8fpfreRTgpMo1B70mg4N
+2juC98uOComRP9YCxpl+o8nOVIMX94rIkxZFC+mteOvEww0AUTousBc0IhfUjv8m
+eAH4dyLG9EZ7kdZ4mVtWTFY8Awk/fZKZa+woPPcRDVVpfQIDAQABo1AwTjAdBgNV
+HQ4EFgQUtX8sjz1TeLUI+EoDCOCz6COuk4wwHwYDVR0jBBgwFoAUtX8sjz1TeLUI
++EoDCOCz6COuk4wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPKcF
+95eRhzP20Hzh8s7xMZ+fFYxnd4wNgiA+QreYXWosmznfXZrJULIxdoDzFIwc0o2V
+dFbfYSGDP5AF+Rg0ozQNXvcC+J9lKbh8OSLB2b0l7LgoRxi7q/5Fp4NIX6paEwQs
+fXhPOfWyfRnn90UvFDCi6fGzIE5y8hW6JBtL8TvM5Bspv1SURWzxcVfLL7CLWq/o
+WIHRfSty/0uIzW/lN37GPo00dUxAi6YbG6ApMYqskVgjZF9HQRG2eLB8vnN5lVMW
+EzKjoTVzBIc5DFJYcngBLyEe8FTjjudAGErWuO34At65eltaicMvt+BoSTwlbqPY
+N+v+oW0soUwCiTs30w==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -58,7 +86,7 @@ Dju2WmHxhbWhLCF5ZvJJqOHvdpzk+TJdQPVBuI6m6pH48MY=
     <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:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicam.it</shibmd:Scope>
     </md:Extensions>
@@ -66,27 +94,55 @@ Dju2WmHxhbWhLCF5ZvJJqOHvdpzk+TJdQPVBuI6m6pH48MY=
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIID3zCCAsegAwIBAgIJAK8S/P0j6pHIMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJJVDERMA8GA1UEBwwIQ2FtZXJpbm8xGTAXBgNVBAoMEGlkcC5jcy51bmlj
-YW0uaXQxDzANBgNVBAsMBlVOSUNBTTEPMA0GA1UEAwwGVU5JQ0FNMSYwJAYJKoZI
-hvcNAQkBFhdtYXJjby5tYWNjYXJpQHVuaWNhbS5pdDAeFw0xNjAzMDcxMDAwMDda
-Fw00NjAyMjgxMDAwMDdaMIGFMQswCQYDVQQGEwJJVDERMA8GA1UEBwwIQ2FtZXJp
-bm8xGTAXBgNVBAoMEGlkcC5jcy51bmljYW0uaXQxDzANBgNVBAsMBlVOSUNBTTEP
-MA0GA1UEAwwGVU5JQ0FNMSYwJAYJKoZIhvcNAQkBFhdtYXJjby5tYWNjYXJpQHVu
-aWNhbS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANezKrkTEIyg
-1iLjYv99i/9Yfx34osPh3GwCylEyaO2TACLZbGd3xLfC3MI4FUWJbbyGFlDEPXpP
-aeAVGTRChjKN1GDHeE2yRNEjyxkp3hleuGTswQZIv56kUFVFFD6Dxp5/pSLoXXan
-V3fYxqri98koX5s6Jhm8Pb7dpbaG68JygxGgS4nUx5ccQn3n2E5cqq2Lg0XBp4Mu
-FB18gGncrtMnYKAY30ey/0vBcSt9DMDpsuMhTRqY49UJ1cR38AAxx26ogoO9fyty
-WtwX2aVFvwJiiSGpzK+eUZdza6LrU/i3D03uAumo1TFrcJ1tf/TEmGJeu+rG3zFy
-y7DgZBlUBFECAwEAAaNQME4wHQYDVR0OBBYEFFqip93yeZgp7DdIQTI0P5M8Ww/c
-MB8GA1UdIwQYMBaAFFqip93yeZgp7DdIQTI0P5M8Ww/cMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBALBlHlMBhe3Vw1Q8QMWRBMFpSN9r8vp0ve9pF1r7
-yCe4Rxk7PYe6gXJliISitm/w0mzO6zZ4fOh1H3PWKNPqXOQ920FyD453q/8gfI0P
-4So3erBawu1nTqR4WXIIUr16IiOup4pQqHmkSjfKSeGkvFR1c1fJ7vjCP4sUmSym
-4t2DftzTdlJYHXomcMf2V/hBiJc728KcjgUDc4FSl9vyCW5i6ftVyqYFKKoB0lCC
-RPhyOoywqlrl32bj8Pq29RqmIL7ZCWEmaoiXpyHOxvHdSIoFRAFs0RWX3/IMYuhf
-Dju2WmHxhbWhLCF5ZvJJqOHvdpzk+TJdQPVBuI6m6pH48MY=
+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:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDCTCCAfGgAwIBAgIJAODqdYOcRuvYMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMMEGlkcC5jcy51bmljYW0uaXQwHhcNMTYwMzI0MTExMTI0WhcNNDYwMzE3MTEx
+MTI0WjAbMRkwFwYDVQQDDBBpZHAuY3MudW5pY2FtLml0MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAx/kNUtQKUnqJJ0SreXDl743E0RRpe90AVYsJv0H2
+IT2Lmo8cM4AGNW6sHYBczRUc/caERx82hTZHg2/ZYJUElSz350oyE8kfIvxzNYzw
+6uLREdacMOaolFKJsw4W5PSoXLf9zTzdRTTDx0zo4GP28Ash4xS11VQMEpRxE/v4
+5qPiJiT6B2n1GeOtI1D5JeMUc4EvA/CIm2EBlXVkObrb8fpfreRTgpMo1B70mg4N
+2juC98uOComRP9YCxpl+o8nOVIMX94rIkxZFC+mteOvEww0AUTousBc0IhfUjv8m
+eAH4dyLG9EZ7kdZ4mVtWTFY8Awk/fZKZa+woPPcRDVVpfQIDAQABo1AwTjAdBgNV
+HQ4EFgQUtX8sjz1TeLUI+EoDCOCz6COuk4wwHwYDVR0jBBgwFoAUtX8sjz1TeLUI
++EoDCOCz6COuk4wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPKcF
+95eRhzP20Hzh8s7xMZ+fFYxnd4wNgiA+QreYXWosmznfXZrJULIxdoDzFIwc0o2V
+dFbfYSGDP5AF+Rg0ozQNXvcC+J9lKbh8OSLB2b0l7LgoRxi7q/5Fp4NIX6paEwQs
+fXhPOfWyfRnn90UvFDCi6fGzIE5y8hW6JBtL8TvM5Bspv1SURWzxcVfLL7CLWq/o
+WIHRfSty/0uIzW/lN37GPo00dUxAi6YbG6ApMYqskVgjZF9HQRG2eLB8vnN5lVMW
+EzKjoTVzBIc5DFJYcngBLyEe8FTjjudAGErWuO34At65eltaicMvt+BoSTwlbqPY
+N+v+oW0soUwCiTs30w==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
index 6fdbbf7f..14f00c75 100644
--- a/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
@@ -18,14 +18,14 @@
     <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:DisplayName xml:lang="en">Global Change Research Institute CAS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav výzkumu globální změny AV ČR, v. v. i.</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider GCRI AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚVGZ AV ČR</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://www.czechglobe.cz/en/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="cs">http://www.czechglobe.cz/cs/</mdui:InformationURL>
-        <mdui:Logo height="44" width="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:Logo height="44" width="119">https://jiftach.cas.cz/loga/logo-uvgz-44.png</mdui:Logo>
+        <mdui:Logo height="137" width="371">https://jiftach.cas.cz/loga/logo-uvgz-137.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -103,10 +103,10 @@ Lkio9BWK20qYnioVmdQhMS9PZ7ZE0a0/waCeF9gfzEvW+7LT1muTh7oLPO8=
     <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:OrganizationName xml:lang="en">Global Change Research Institute CAS</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav výzkumu globální změny AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Global Change Research Institute CAS, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav výzkumu globální změny AV ČR, v. v. i.</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.czechglobe.cz/en/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="cs">http://www.czechglobe.cz/cs/</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..adc7ac5e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.efc.ac.uk/idp/shibboleth">
+  <!--
+		This is an IdP for Epping Forest College.
+	-->
+  <Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-11T12:54:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efc.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Epping Forest College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Epping Forest College Shibboleth IdP</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDIDCCAgigAwIBAgIVAJFRmkgwhw52LYLRaMPn4753oNLdMA0GCSqGSIb3DQEB
+						CwUAMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswHhcNMTYwMzE3MTE0MzM5WhcN
+						MzYwMzE3MTE0MzM5WjAYMRYwFAYDVQQDDA1pZHAuZWZjLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApNTw5TLO9Ge/T8f0r55g3oYeWEIcsunU
+						7e0Mqn3f5Bx+9Jq2gPKKoKJwGAbM44ZHp9kT2lv9fbgLoqV4wsN5kAaUyQ0V1I2T
+						R2HQ1WGYaYyB0NQFZB30SVZ/NA446OO7/JQjvC6UrgDjLlh+tHKfvtr9M7p/t5aA
+						OiJK78plnV/YyRkAmGMNjqtqC5UYaknQsRyd5FaKJkmxA/LDtn50yZUDrtmSVCco
+						wGPPAvSjtrtKMXvIOleR7IUd8RTGcLm9FRe0PSMwlq5Wni0E7/VNVD2cbVQ/N4JL
+						cFZkRL6k3hNj8LZvwz8RVm3ihPuPhs9N72ML5+LK2POCZ1zjceC9VwIDAQABo2Ew
+						XzAdBgNVHQ4EFgQUCueTLaZVrYTMUiuPwdJTc4lvcNkwPgYDVR0RBDcwNYINaWRw
+						LmVmYy5hYy51a4YkaHR0cHM6Ly9pZHAuZWZjLmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MA0GCSqGSIb3DQEBCwUAA4IBAQCAGITy3H8BKF/HwonbKtRsEG1nAlU5I+rTp4/m
+						SW2Hm76+w4xicHWvHiDOOfvOU/xiTJgWRiubpY6Lu2+m4yrArcYGvOdUrw5tB7bQ
+						mZBl/xr6JQAjbqKypBO+W95x3KWFWTtq3vNTRPsW8skCArzhLnJJNg4/nwr2IE4X
+						aEi2HUCZ6uy3OFf9gUAXuUIQIEtWzEfYcu5IXlWYk7H1Jh2qyBVLfdYE4J5zEt/6
+						txchHGxkg1bMiMIjEv+sfkrQm1Vvk5p71nqcBdb+i0/u1zBDQR6fPtn7dzqGR5jx
+						FESrzA5BMELrUJnQ3KIkLgFEGDGnWM9gSQwnfMhMRvuLMqy6
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDHzCCAgegAwIBAgIUOXBO8f5f0h/99rHsjUGvuzOOJCwwDQYJKoZIhvcNAQEL
+						BQAwGDEWMBQGA1UEAwwNaWRwLmVmYy5hYy51azAeFw0xNjAzMTcxMTQzMzdaFw0z
+						NjAzMTcxMTQzMzdaMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQoowAbiQx7g+RBCwYkM3QolXf8opzpjWr
+						X5kD6C+lc9FyRbPBWUsewQlcKOuNy46ernfLi+K49WKD0bdjffK42Y4c0jhi7XMf
+						Gg2PfD5xSQy3v6A+P6lpbYbxTQlqenUFRb5djFsot8gsKaLdfTGNizE8lPYaMJPw
+						8ELTmgBdeXkhFFXJCRxEeFTjBstc0HcyVAgnYr8nZEZzpFIUxpi1A81Qcq5OCk7+
+						yph8Gp2Ossneh4L0ZzHKvbCMjxHBhF6zrdneJfTKed9JzYKLm4L0QPvIE46CiAnD
+						oUAz5weBBvdqox6rh3E4Q6mH5+eguiDeLy5jIubyOAq6ai8SelCNAgMBAAGjYTBf
+						MB0GA1UdDgQWBBR/+c7vffPYnB1eNa6B2zavd7rzJDA+BgNVHREENzA1gg1pZHAu
+						ZWZjLmFjLnVrhiRodHRwczovL2lkcC5lZmMuYWMudWsvaWRwL3NoaWJib2xldGgw
+						DQYJKoZIhvcNAQELBQADggEBABepHt+qyj0kAJRbJOo/r85+JGibsxsz6bgezVHx
+						/maSj3XFDgVzC9LjuHG3y8Hd1se4hIWg92RjoC3fBI2x1GjwOdGga7oQHiREv4+V
+						3wBimcmqztPK8G0U3rGDMeDVy+kyUYMgpdf5MxTFDjLx91FdACMaNTTMigAGWVbw
+						C3srGBGXk0RsEgZD4JkP9LUW91oXuqhxki6kZO+Isyw4PlgazdB4y4Uc+VlCh6y6
+						P9e8ihxbhKaN/zpepysWoPpTh8GjPnz6Z4OOVtvZNvFaPk5uQcotBVdW3B3IvGe3
+						k5Yp5NSOAwlFfg9z/Xil7SQY8qxGi3ubkN5uRIoo0aay6/Y=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDIDCCAgigAwIBAgIVAP6ohCGvdEG1dnh4PrjWIjzXKARGMA0GCSqGSIb3DQEB
+						CwUAMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswHhcNMTYwMzE3MTE0MzM5WhcN
+						MzYwMzE3MTE0MzM5WjAYMRYwFAYDVQQDDA1pZHAuZWZjLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg5NOOh728m29wPobTiOHr6UuEnHccxZR
+						rJ6cCVxWkJMdyb9FVJ53pMWbCmLrMpPl63uxs1LsJN+y+ksmoFEkBledGMhCsBlh
+						INwjraPHgtYdX5tvlOWtPBDvadI7yAjTohmzC18Y4HicGyf+N8wd7o2ZIf8Emkoy
+						xemehjPHPrydJMMYpFjKkh5SJovAiTIIfBXpg/5zUJ8hi8Mm5kSW+5AQVoGensvp
+						pG91nLp+jcaKGawlg0d/pvca0Qrw4eJTFukAKT6U2O7TrC1qpK0GcC/oMmHSC0C8
+						dGAvgwEYWyg5w5WIAQVntzqgWfGlm0RGR0rDStQ7oyhtlOz1lHmMcwIDAQABo2Ew
+						XzAdBgNVHQ4EFgQUEGCQsUv3Uai6wzZ7Hwq7hfU3bpMwPgYDVR0RBDcwNYINaWRw
+						LmVmYy5hYy51a4YkaHR0cHM6Ly9pZHAuZWZjLmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MA0GCSqGSIb3DQEBCwUAA4IBAQBtbPSWiXrw62ZbVJHSaouA2rV6wtwlbPmuLAhc
+						Z5F6LEtTdyXGkzK/5arRzqXmOjZe/ym4Y25MNf2kgtcL5XDjH0CtryNxJRZEnnRQ
+						St9xyxZjBl41QGNE//h4hiNyFSBERQ8rMgPn/eZ6/C0fD2MYcUjQqY2K0eINHWFK
+						twO/Qhc+Ap85rvUlnxkHJuhOqjQrD0VkENe1Z47Rnx1pyr4RgRt/K8dWHXOpQGBt
+						HQSlmxxBb+6hFpDrrOq7cW+mG/niWbp0vh118CM21W8xUWeU+7Is2JuHhic5oImZ
+						fme2bStBabIJQ5C7qVD0H+E6Hoa3Qe80s5fsVerqwK0KaW7s
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.efc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.efc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.efc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efc.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDIDCCAgigAwIBAgIVAJFRmkgwhw52LYLRaMPn4753oNLdMA0GCSqGSIb3DQEB
+						CwUAMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswHhcNMTYwMzE3MTE0MzM5WhcN
+						MzYwMzE3MTE0MzM5WjAYMRYwFAYDVQQDDA1pZHAuZWZjLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApNTw5TLO9Ge/T8f0r55g3oYeWEIcsunU
+						7e0Mqn3f5Bx+9Jq2gPKKoKJwGAbM44ZHp9kT2lv9fbgLoqV4wsN5kAaUyQ0V1I2T
+						R2HQ1WGYaYyB0NQFZB30SVZ/NA446OO7/JQjvC6UrgDjLlh+tHKfvtr9M7p/t5aA
+						OiJK78plnV/YyRkAmGMNjqtqC5UYaknQsRyd5FaKJkmxA/LDtn50yZUDrtmSVCco
+						wGPPAvSjtrtKMXvIOleR7IUd8RTGcLm9FRe0PSMwlq5Wni0E7/VNVD2cbVQ/N4JL
+						cFZkRL6k3hNj8LZvwz8RVm3ihPuPhs9N72ML5+LK2POCZ1zjceC9VwIDAQABo2Ew
+						XzAdBgNVHQ4EFgQUCueTLaZVrYTMUiuPwdJTc4lvcNkwPgYDVR0RBDcwNYINaWRw
+						LmVmYy5hYy51a4YkaHR0cHM6Ly9pZHAuZWZjLmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MA0GCSqGSIb3DQEBCwUAA4IBAQCAGITy3H8BKF/HwonbKtRsEG1nAlU5I+rTp4/m
+						SW2Hm76+w4xicHWvHiDOOfvOU/xiTJgWRiubpY6Lu2+m4yrArcYGvOdUrw5tB7bQ
+						mZBl/xr6JQAjbqKypBO+W95x3KWFWTtq3vNTRPsW8skCArzhLnJJNg4/nwr2IE4X
+						aEi2HUCZ6uy3OFf9gUAXuUIQIEtWzEfYcu5IXlWYk7H1Jh2qyBVLfdYE4J5zEt/6
+						txchHGxkg1bMiMIjEv+sfkrQm1Vvk5p71nqcBdb+i0/u1zBDQR6fPtn7dzqGR5jx
+						FESrzA5BMELrUJnQ3KIkLgFEGDGnWM9gSQwnfMhMRvuLMqy6
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDHzCCAgegAwIBAgIUOXBO8f5f0h/99rHsjUGvuzOOJCwwDQYJKoZIhvcNAQEL
+						BQAwGDEWMBQGA1UEAwwNaWRwLmVmYy5hYy51azAeFw0xNjAzMTcxMTQzMzdaFw0z
+						NjAzMTcxMTQzMzdaMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQoowAbiQx7g+RBCwYkM3QolXf8opzpjWr
+						X5kD6C+lc9FyRbPBWUsewQlcKOuNy46ernfLi+K49WKD0bdjffK42Y4c0jhi7XMf
+						Gg2PfD5xSQy3v6A+P6lpbYbxTQlqenUFRb5djFsot8gsKaLdfTGNizE8lPYaMJPw
+						8ELTmgBdeXkhFFXJCRxEeFTjBstc0HcyVAgnYr8nZEZzpFIUxpi1A81Qcq5OCk7+
+						yph8Gp2Ossneh4L0ZzHKvbCMjxHBhF6zrdneJfTKed9JzYKLm4L0QPvIE46CiAnD
+						oUAz5weBBvdqox6rh3E4Q6mH5+eguiDeLy5jIubyOAq6ai8SelCNAgMBAAGjYTBf
+						MB0GA1UdDgQWBBR/+c7vffPYnB1eNa6B2zavd7rzJDA+BgNVHREENzA1gg1pZHAu
+						ZWZjLmFjLnVrhiRodHRwczovL2lkcC5lZmMuYWMudWsvaWRwL3NoaWJib2xldGgw
+						DQYJKoZIhvcNAQELBQADggEBABepHt+qyj0kAJRbJOo/r85+JGibsxsz6bgezVHx
+						/maSj3XFDgVzC9LjuHG3y8Hd1se4hIWg92RjoC3fBI2x1GjwOdGga7oQHiREv4+V
+						3wBimcmqztPK8G0U3rGDMeDVy+kyUYMgpdf5MxTFDjLx91FdACMaNTTMigAGWVbw
+						C3srGBGXk0RsEgZD4JkP9LUW91oXuqhxki6kZO+Isyw4PlgazdB4y4Uc+VlCh6y6
+						P9e8ihxbhKaN/zpepysWoPpTh8GjPnz6Z4OOVtvZNvFaPk5uQcotBVdW3B3IvGe3
+						k5Yp5NSOAwlFfg9z/Xil7SQY8qxGi3ubkN5uRIoo0aay6/Y=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDIDCCAgigAwIBAgIVAP6ohCGvdEG1dnh4PrjWIjzXKARGMA0GCSqGSIb3DQEB
+						CwUAMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswHhcNMTYwMzE3MTE0MzM5WhcN
+						MzYwMzE3MTE0MzM5WjAYMRYwFAYDVQQDDA1pZHAuZWZjLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg5NOOh728m29wPobTiOHr6UuEnHccxZR
+						rJ6cCVxWkJMdyb9FVJ53pMWbCmLrMpPl63uxs1LsJN+y+ksmoFEkBledGMhCsBlh
+						INwjraPHgtYdX5tvlOWtPBDvadI7yAjTohmzC18Y4HicGyf+N8wd7o2ZIf8Emkoy
+						xemehjPHPrydJMMYpFjKkh5SJovAiTIIfBXpg/5zUJ8hi8Mm5kSW+5AQVoGensvp
+						pG91nLp+jcaKGawlg0d/pvca0Qrw4eJTFukAKT6U2O7TrC1qpK0GcC/oMmHSC0C8
+						dGAvgwEYWyg5w5WIAQVntzqgWfGlm0RGR0rDStQ7oyhtlOz1lHmMcwIDAQABo2Ew
+						XzAdBgNVHQ4EFgQUEGCQsUv3Uai6wzZ7Hwq7hfU3bpMwPgYDVR0RBDcwNYINaWRw
+						LmVmYy5hYy51a4YkaHR0cHM6Ly9pZHAuZWZjLmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MA0GCSqGSIb3DQEBCwUAA4IBAQBtbPSWiXrw62ZbVJHSaouA2rV6wtwlbPmuLAhc
+						Z5F6LEtTdyXGkzK/5arRzqXmOjZe/ym4Y25MNf2kgtcL5XDjH0CtryNxJRZEnnRQ
+						St9xyxZjBl41QGNE//h4hiNyFSBERQ8rMgPn/eZ6/C0fD2MYcUjQqY2K0eINHWFK
+						twO/Qhc+Ap85rvUlnxkHJuhOqjQrD0VkENe1Z47Rnx1pyr4RgRt/K8dWHXOpQGBt
+						HQSlmxxBb+6hFpDrrOq7cW+mG/niWbp0vh118CM21W8xUWeU+7Is2JuHhic5oImZ
+						fme2bStBabIJQ5C7qVD0H+E6Hoa3Qe80s5fsVerqwK0KaW7s
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Epping Forest College</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Epping Forest College</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.efc.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Robert</GivenName>
+    <SurName>Laryea</SurName>
+    <EmailAddress>mailto:RLARYEA@efc.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Naeem</GivenName>
+    <SurName>Rehman</SurName>
+    <EmailAddress>mailto:nrehman@efc.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Robert</GivenName>
+    <SurName>Laryea</SurName>
+    <EmailAddress>mailto:RLARYEA@efc.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Naeem</GivenName>
+    <SurName>Rehman</SurName>
+    <EmailAddress>mailto:nrehman@efc.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml
index 8a3dbfb3..f1081078 100644
--- a/swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml
@@ -7,8 +7,8 @@
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth: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>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agro-bordeaux.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enitab.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Bordeaux Sciences Agro</mdui:DisplayName>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACjUlEQVQozzWSS0hUcRjFz/e/d+4dR1PHBA0netBoQgYuSoQiWhS5ibKsoNq0y4VBES4ipE1RbYKgiFBcSIaLXptQQyHIzBaaVGTjKwsf89ByZpy5r+9rMXoWZ/XjbM6PRARArkEg8FJqIpn8t2vLPhGdyGH4FAMQKEIOXQ/Lmqy1D9643I6bz3b8XBgS4a6+ts+Tr0VEvHWKWDwBlKgMkm1dF+ZWh4LBQGkB7wzUhXece9LTxChpvdi1N9QAAPAUhAEG4fbz1tFEn2kW+ojY03aFD9/vvqcXBlUAj160pJ0oBCKiiJSC/n588NXXx4a5CURwM5XljZO/aTw2bTlFhm6u2Isvh5+CAOhKhGzYs9npbWV7ddtgWLpTeLj2fPvbN6qgcDlTFMvqccvXP9aRwRIEioh+zP+41XGn+XirmQ7Y8qe28tRqFBPpT7oyI/P8bdG1EbLseGR+hBQUgJmlqZg2Ozo+c/poSyaNgzVnhyaG/UZeNGbMJ7NC+Yos23Bn4zMAFADHcfx+o2Ogc09VfXXJse1FlaO/vq+m/X9XsqSBRAi20rXlZAyADiAU3Eqsp4xE77uPV888BPKmFqOrcUARAUQEQBh5mgFAgbF7a/UmDgZ8+T0fugvMEKB+LcVyWwBEAIK4qNhcDUAJuNhf3FjX5Fk8Z3/5tvAdAGkmyAMAEgGzsE8L1oQPwIWCUgCunLxeLMGU5kSnpwBUloUhDti0yHY1K7Wcbj7yoAjl0KEEAKMir6zzWrvySuficQD7w9XI2tCynmWnEl5r471DVQ25p+EJiyvssAhHUpH+j70iMhAZRj1wYsvJu5dGFsZERBxhYRGBiMfCvO6im9M2w2sjvyf/rCXcDZF5A/kPEBuA6WS49/UAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzUrMDI6MDDnTYFMAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjM1KzAyOjAwlhA58AAAAABJRU5ErkJggg==</mdui:Logo>
diff --git a/swamid-interfederations-2.0/idp.ens-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ens-lyon.fr-idp-shibboleth.xml
index fdd1bed4..fe9226d3 100644
--- a/swamid-interfederations-2.0/idp.ens-lyon.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ens-lyon.fr-idp-shibboleth.xml
@@ -9,11 +9,11 @@
     <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-lyon.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ENS DE LYON IDP3</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ENS de Lyon</mdui:DisplayName>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAZQTFRFAAAA////pdmf3QAAACZJREFUeNpiYMAAjCiALAFGRgwlQEEGJAqXCrBuslWQ4XQ0ABBgAFz4AK1qB6hoAAAAAElFTkSuQmCC</mdui:Logo>
         <mdui:InformationURL xml:lang="fr">http://www.ens-lyon.fr</mdui:InformationURL>
         <mdui:Description xml:lang="en">Identification de la population interne globale de l'établissement (personnels, étudiants, enseignants, chercheurs).</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">ENS DE LYON IDP3</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">ENS de Lyon</mdui:DisplayName>
         <mdui:Description xml:lang="fr">Identification de la population interne globale de l'établissement (personnels, étudiants, enseignants, chercheurs).</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
@@ -72,8 +72,8 @@ zIykQBVWdeDI/sVOSYwmk9MsLXzUas8jniWGC8CTsrKyfp7HtsVctGzfNSA=
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ens-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">ENS DE LYON IDP3</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENS DE LYON IDP3</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">ENS de Lyon</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENS de Lyon</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.ens-lyon.fr</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml
index 821579fa..4428bf80 100644
--- a/swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml
@@ -7,8 +7,8 @@
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.net</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">ENTPE - Vaulx en Velin</mdui:DisplayName>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACbElEQVQoz22SX0hTcRTHz343Ze3CxHsnzgRRRviyXjYIroKGKPgYk2BPPfhgNIMMEnwxMgkGvRqUjEEzhnuZIhs97UE0GLIYXaFE6U52R7TrXeH+uXZ/93d60Mq07/P5HL7nfL+WhTX8XofL8nvrn96v9vT0jI6OIkJaAVmFe7cA8H/KZrOSJAUCAUrpjzrOxzEQwdpPRMSLAKV0ZWVFFMXZ2dlm0/hyhMNBXN5EhkgpPTw8/AcolUp+v7+lpWVpaclkbO0D3nyGG1lExEajkUgk8vn8X2B7e9vj8QiCsL6+Tk1c3kT3PG7tIyIqipJIJGRZZoydAclksqOjw+12y7L87RgfvEXPU5RVZIxlMpk3kcje3t7pJNRqtWAwKAjC+Pi4ph2lPuONJyg9x5yOlNJUKhUOh/Oq+scI+CYmrFbr4uJioWQ8jqHjIfpfYeUEq9VqMpmMRqO6rp+/E8rlsqZp+0WceIn8fVzYwJMm6roeiUTi8Xi1Wr3wRovJMJqG4DuoNeDFHfB5mSzLu7u7XV1dQ0NDra2tFwK1PFrF0BYMuOD1XbhmN9LptKIoLpdLkiSO4y434MrwdSb1wW2vhbMgIkHEkZGR7u5u+F0CQsiZewBCCHdS/Fj/mrFdtc7MzBiGoapqpVKZmpra2dkxTXNubi4Wi/X394+NjZXL5cHBQcJxXGdnp8PhaGtrC4VC7e3tPp/P6XROT0/zPC+KYi6XO93d29tHCCEAwPO8zWaTpAFN0w4ODs47LhaL4XDYbrcTQkRRAADCGDNNs1AoAODk5KSmaQBgmiallDHmdDq9Xi9jzDAMXdebzeYvcjfFs1cEA2EAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NDErMDI6MDAZx6xGAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjQxKzAyOjAwaJoU+gAAAABJRU5ErkJggg==</mdui:Logo>
@@ -49,8 +49,8 @@ BY7XFJgwUuyw39r64rK9lOkAjCZntHyPjx/sy8m020A=
   </md:IDPSSODescriptor>
   <md: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.net</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
index 5a088b45..b69cb9f9 100644
--- a/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
 <?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:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-11T12:36:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -81,6 +81,31 @@ EyP/QDjoD02nYu++815n4g==
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDDDCCAfSgAwIBAgIJAM2y4eON2PnqMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
+BAMTC2lkcC5lcGZsLmNoMB4XDTE2MDMyOTEzMzQzM1oXDTE5MDMyOTEzMzQzM1ow
+FjEUMBIGA1UEAxMLaWRwLmVwZmwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDD7LOez3zrlr+A6IpY1G9Qp5VIA++bAUEe+zZMu7HbkISrqPLAqFWb
+O5cF1vgqfQQKmGYfeITgI2HxeizfXWtF662vI1K18yDX73K+tl0zCy7jmvCKqmeF
+gi31OSbHk2bZR2F9HUwGGkcenidhMKn+kDrEypxelzUjhFUqfw6s7lmxUogOoDdf
+xEQaYKfsCiOIsecI6JJ7VUgm0M3dAqXMmMs3B5K3O4QIjLaFsIRb+joCANL9TUz9
+HFwUZmaR69s5zreWi/FVQF/mMEDeMXTfzyClu692FpWQ7fJns6quoaavSyOBGcOY
+ma8NtVkmkxgO8JjtlwIDqwAWkH8ML6aRAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
+cC5lcGZsLmNohiJodHRwczovL2lkcC5lcGZsLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRe/zKjyhGnk+X89C9ynWEPakNhJjANBgkqhkiG9w0BAQsFAAOCAQEA
+idtG/yOJo1kQVkWxFdD1mO6AY8JbTuJCwbxHUKsWFuyvk/rN74TI1SmYKmt01v7G
+ZnRnrxEiP8nm0+tMZC8GMoBe65XTpa1L6jVD2xK2gVc1R/8GviL5/wfYa652uUCB
+iduzNGuKgsRUqOIXCdRZpnSTazvnKvSE1pwWWbWqvK64IjdZPPc0JLpUx2z1z2YP
+CH9vvkQUa54Z82a+lRLl/JXSGApYETFxBD/mxuL6DyhhcZ/eMniejll/iBZMs2TQ
+q4Uf4QOFWwomWhTzbJ9RoW5PqxmujfI4twlL0SAifiRur90Wd2+wm2QT5LHgEaLL
+pTA8OOnOcAQgmsJXODtWzw==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
@@ -120,6 +145,31 @@ EyP/QDjoD02nYu++815n4g==
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDDDCCAfSgAwIBAgIJAM2y4eON2PnqMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
+BAMTC2lkcC5lcGZsLmNoMB4XDTE2MDMyOTEzMzQzM1oXDTE5MDMyOTEzMzQzM1ow
+FjEUMBIGA1UEAxMLaWRwLmVwZmwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDD7LOez3zrlr+A6IpY1G9Qp5VIA++bAUEe+zZMu7HbkISrqPLAqFWb
+O5cF1vgqfQQKmGYfeITgI2HxeizfXWtF662vI1K18yDX73K+tl0zCy7jmvCKqmeF
+gi31OSbHk2bZR2F9HUwGGkcenidhMKn+kDrEypxelzUjhFUqfw6s7lmxUogOoDdf
+xEQaYKfsCiOIsecI6JJ7VUgm0M3dAqXMmMs3B5K3O4QIjLaFsIRb+joCANL9TUz9
+HFwUZmaR69s5zreWi/FVQF/mMEDeMXTfzyClu692FpWQ7fJns6quoaavSyOBGcOY
+ma8NtVkmkxgO8JjtlwIDqwAWkH8ML6aRAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
+cC5lcGZsLmNohiJodHRwczovL2lkcC5lcGZsLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRe/zKjyhGnk+X89C9ynWEPakNhJjANBgkqhkiG9w0BAQsFAAOCAQEA
+idtG/yOJo1kQVkWxFdD1mO6AY8JbTuJCwbxHUKsWFuyvk/rN74TI1SmYKmt01v7G
+ZnRnrxEiP8nm0+tMZC8GMoBe65XTpa1L6jVD2xK2gVc1R/8GviL5/wfYa652uUCB
+iduzNGuKgsRUqOIXCdRZpnSTazvnKvSE1pwWWbWqvK64IjdZPPc0JLpUx2z1z2YP
+CH9vvkQUa54Z82a+lRLl/JXSGApYETFxBD/mxuL6DyhhcZ/eMniejll/iBZMs2TQ
+q4Uf4QOFWwomWhTzbJ9RoW5PqxmujfI4twlL0SAifiRur90Wd2+wm2QT5LHgEaLL
+pTA8OOnOcAQgmsJXODtWzw==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index c0e51158..aff31c4b 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -204,8 +204,10 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjartdal.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjelmeland.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hobol.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hof.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hol.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holeskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holmestrand.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hornindal.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">horten.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoyanger.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.fh-joanneum.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fh-joanneum.at-idp-shibboleth.xml
index 9f304cbe..3228917e 100644
--- a/swamid-interfederations-2.0/idp.fh-joanneum.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.fh-joanneum.at-idp-shibboleth.xml
@@ -17,8 +17,8 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="de">FH Joanneum</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">FH Joanneum</mdui:DisplayName>
-        <mdui:Logo height="47" width="218">https://www.fh-joanneum.at/custom/images/logo_1001.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.fh-joanneum.at/favicon.ico</mdui:Logo>
+        <mdui:Logo width="218" height="47">https://www.fh-joanneum.at/custom/images/logo_1001.png</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://www.fh-joanneum.at/favicon.ico</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>fh-joanneum.at</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml
index efbecfdc..8b61b7a3 100644
--- a/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml
@@ -20,43 +20,6 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIFWzCCBEOgAwIBAgIQcxLz64WSGpB5dcmeJhykXTANBgkqhkiG9w0BAQUFADBR
-MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNv
-bW1vbjEbMBkGA1UEAxMSSW5Db21tb24gU2VydmVyIENBMB4XDTEzMDMyNjAwMDAw
-MFoXDTE2MDMyNTIzNTk1OVowgcUxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwUyMDAw
-MjELMAkGA1UECBMCREMxEzARBgNVBAcTCldhc2hpbmd0b24xGzAZBgNVBAkTEjgw
-MCBGbG9yaWRhIEF2ZSBORTEdMBsGA1UEChMUR2FsbGF1ZGV0IFVuaXZlcnNpdHkx
-LDAqBgNVBAsTI0dUUyAtIEdhbGxhdWRldCBUZWNobm9sb2d5IFNlcnZpY2VzMRow
-GAYDVQQDExFpZHAuZ2FsbGF1ZGV0LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANfcspLsGM55hXwOdOmwYne/M2rZ+7rqKtMoDjUNZARc+oTEK3Nf
-w0nPXN6d6vIlemEB/kvC3HAZy6zcUTrFpDYNPjqqI6eGfprOXO3VSXm0bLBeWNGX
-Ak9ccgpcGXBxNtJTQMuv6HEBOpiCbd7/eBDRG14yPb4ydUX1DbXez4uAP65b2nRz
-X4THs9bveQbUcBks+pl8PfPZCPv1ahxyodIR2eF2YsebJHphSkX6ivX0BVslk384
-/jUR3KM4efP2kG2p56BYlpp3D0KG5EG9LKFhHxq/3YUhVhqnVkeGl4XPIpOBzZlO
-ttep/75p1yjktaBfmhd5WMW7uIKyBySrqskCAwEAAaOCAbgwggG0MB8GA1UdIwQY
-MBaAFEhPWvovSppe4FDza3tVpd71vjRdMB0GA1UdDgQWBBRCk3Cnk79hmYIoCVhI
-V4MOg8l9dzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwZwYDVR0gBGAwXjBSBgwrBgEEAa4jAQQDAQEw
-QjBABggrBgEFBQcCARY0aHR0cHM6Ly93d3cuaW5jb21tb24ub3JnL2NlcnQvcmVw
-b3NpdG9yeS9jcHNfc3NsLnBkZjAIBgZngQwBAgIwPQYDVR0fBDYwNDAyoDCgLoYs
-aHR0cDovL2NybC5pbmNvbW1vbi5vcmcvSW5Db21tb25TZXJ2ZXJDQS5jcmwwbwYI
-KwYBBQUHAQEEYzBhMDkGCCsGAQUFBzAChi1odHRwOi8vY2VydC5pbmNvbW1vbi5v
-cmcvSW5Db21tb25TZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3Nw
-LmluY29tbW9uLm9yZzAcBgNVHREEFTATghFpZHAuZ2FsbGF1ZGV0LmVkdTANBgkq
-hkiG9w0BAQUFAAOCAQEABGCKCRVS1KcSMAgYOQPwruCoVdNxKEEaqbeKhWiC1k5y
-flJQw1fb2jzHFVg4YoI9A3KL3MrCxDMYq+ROhDS3f4aEEwMpSKSeNw/1riqBLtqn
-YSa9mY7Q+QHQxus8ZZceNn8zyI1xuK7TG83ZsOf75S4uPnlekaqHldC9QWPsGc8p
-nEEexraMIjgeDTEHxKOjGMLpIRdS20PTiXg5kDPdi60x39q/E0wY+oiwgmhKslwZ
-T3fg7+A8alM88HA16P2N/y7IKythkrPB87EkNQHfzXWJNhFLx/EnezW/aFj672YS
-+YG4S3bQoO1MSjlD3J5g6MTHmxlO9w8+rppgNEi6PQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
 MIID9DCCAtwCCQCbiUruOaohoTANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgMAkRDMRMwEQYDVQQHDApXYXNoaW5ndG9uMR0wGwYDVQQKDBRH
 YWxsYXVkZXQgVW5pdmVyc2l0eTEmMCQGA1UECwwdR2FsbGF1ZGV0IFRlY2hub2xv
@@ -98,43 +61,6 @@ mzisXEBrL04=
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIFWzCCBEOgAwIBAgIQcxLz64WSGpB5dcmeJhykXTANBgkqhkiG9w0BAQUFADBR
-MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNv
-bW1vbjEbMBkGA1UEAxMSSW5Db21tb24gU2VydmVyIENBMB4XDTEzMDMyNjAwMDAw
-MFoXDTE2MDMyNTIzNTk1OVowgcUxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwUyMDAw
-MjELMAkGA1UECBMCREMxEzARBgNVBAcTCldhc2hpbmd0b24xGzAZBgNVBAkTEjgw
-MCBGbG9yaWRhIEF2ZSBORTEdMBsGA1UEChMUR2FsbGF1ZGV0IFVuaXZlcnNpdHkx
-LDAqBgNVBAsTI0dUUyAtIEdhbGxhdWRldCBUZWNobm9sb2d5IFNlcnZpY2VzMRow
-GAYDVQQDExFpZHAuZ2FsbGF1ZGV0LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANfcspLsGM55hXwOdOmwYne/M2rZ+7rqKtMoDjUNZARc+oTEK3Nf
-w0nPXN6d6vIlemEB/kvC3HAZy6zcUTrFpDYNPjqqI6eGfprOXO3VSXm0bLBeWNGX
-Ak9ccgpcGXBxNtJTQMuv6HEBOpiCbd7/eBDRG14yPb4ydUX1DbXez4uAP65b2nRz
-X4THs9bveQbUcBks+pl8PfPZCPv1ahxyodIR2eF2YsebJHphSkX6ivX0BVslk384
-/jUR3KM4efP2kG2p56BYlpp3D0KG5EG9LKFhHxq/3YUhVhqnVkeGl4XPIpOBzZlO
-ttep/75p1yjktaBfmhd5WMW7uIKyBySrqskCAwEAAaOCAbgwggG0MB8GA1UdIwQY
-MBaAFEhPWvovSppe4FDza3tVpd71vjRdMB0GA1UdDgQWBBRCk3Cnk79hmYIoCVhI
-V4MOg8l9dzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwZwYDVR0gBGAwXjBSBgwrBgEEAa4jAQQDAQEw
-QjBABggrBgEFBQcCARY0aHR0cHM6Ly93d3cuaW5jb21tb24ub3JnL2NlcnQvcmVw
-b3NpdG9yeS9jcHNfc3NsLnBkZjAIBgZngQwBAgIwPQYDVR0fBDYwNDAyoDCgLoYs
-aHR0cDovL2NybC5pbmNvbW1vbi5vcmcvSW5Db21tb25TZXJ2ZXJDQS5jcmwwbwYI
-KwYBBQUHAQEEYzBhMDkGCCsGAQUFBzAChi1odHRwOi8vY2VydC5pbmNvbW1vbi5v
-cmcvSW5Db21tb25TZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3Nw
-LmluY29tbW9uLm9yZzAcBgNVHREEFTATghFpZHAuZ2FsbGF1ZGV0LmVkdTANBgkq
-hkiG9w0BAQUFAAOCAQEABGCKCRVS1KcSMAgYOQPwruCoVdNxKEEaqbeKhWiC1k5y
-flJQw1fb2jzHFVg4YoI9A3KL3MrCxDMYq+ROhDS3f4aEEwMpSKSeNw/1riqBLtqn
-YSa9mY7Q+QHQxus8ZZceNn8zyI1xuK7TG83ZsOf75S4uPnlekaqHldC9QWPsGc8p
-nEEexraMIjgeDTEHxKOjGMLpIRdS20PTiXg5kDPdi60x39q/E0wY+oiwgmhKslwZ
-T3fg7+A8alM88HA16P2N/y7IKythkrPB87EkNQHfzXWJNhFLx/EnezW/aFj672YS
-+YG4S3bQoO1MSjlD3J5g6MTHmxlO9w8+rppgNEi6PQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
 MIID9DCCAtwCCQCbiUruOaohoTANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgMAkRDMRMwEQYDVQQHDApXYXNoaW5ndG9uMR0wGwYDVQQKDBRH
 YWxsYXVkZXQgVW5pdmVyc2l0eTEmMCQGA1UECwwdR2FsbGF1ZGV0IFRlY2hub2xv
diff --git a/swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml
index b0af1710..6f2f0eab 100644
--- a/swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.goldsmiths.ac.uk/idp/shibboleth">
   <!--
-		This is a "Goldsmiths, University of London" Shibboleth IdP for Goldsmiths' College.
+		This is a Shibboleth IdP for Goldsmiths' College.
 	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-07-21T11:02:00Z">
diff --git a/swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml
index a15b165c..f83bf4b2 100644
--- a/swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml
@@ -11,7 +11,7 @@
         <mdui:DisplayName xml:lang="en">GRENA Identity Provider</mdui:DisplayName>
         <mdui:Description xml:lang="en">GRENA Identity Provider</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://gif.grena.ge</mdui:InformationURL>
-        <mdui:Logo height="156" width="375" xml:lang="en">https://idp.grena.ge/logo.png</mdui:Logo>
+        <mdui:Logo width="375" height="156" xml:lang="en">https://idp.grena.ge/logo.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:GeolocationHint>geo:41.70478,44.78696</mdui:GeolocationHint>
diff --git a/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml
index a7a54a94..4d0c9d1d 100644
--- a/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml
@@ -1,7 +1,7 @@
 <?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:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T02:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.heanet.ie/services/identity-access/edugate#join</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
diff --git a/swamid-interfederations-2.0/idp.hec.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hec.fr-idp-shibboleth.xml
index 9f73372c..d84944af 100644
--- a/swamid-interfederations-2.0/idp.hec.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hec.fr-idp-shibboleth.xml
@@ -7,8 +7,8 @@
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hec.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hec.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hec.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">HEC Paris</mdui:DisplayName>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABUklEQVQoz2P8//8/AymAiSTVKBp+/v5z6sq9S7cfo6m4cf/ZqSt3v/34BeX/h4EfP3+JOWZHVkz9jwpKepdzWSS///wVwkXYwMTExMTEyMbKgmYDOxsLEyMjCxMTxX5ABv8ZGP79/w8JQHERfglhfkZGRogUI8Rlr99/Pnn5bmz1TH5eTi1F6c9fv3/+/vPPn78szEy83JxyEkJWBqrWBmo6KjIsh87ePHL+poy4kKaSNDsbi72JxoLGNAZGhr9//33/8evD52+NMzcs3nLk+ZuPNVPXLmhKY9FUkrQ1UmNkZPz95y8TEyMTIyMTEyMDAwMTCzMrDycfD6ekCD87G8vmSYX//v3/9/8/i6ggH5He5ePhpF4oEaXh9+8/7Kysv37/QVPx8/cfbk72nzBxRnhq/ffv/5fvP5gYGXm4OJA1fP3+8+/ff9xc7MxMTCgaiAQAn/KfpHDvcnoAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDErMDI6MDByT8mCAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAxKzAyOjAwAxJxPgAAAABJRU5ErkJggg==</mdui:Logo>
diff --git a/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml
index 64ff7fce..061cfeda 100644
--- a/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml
@@ -19,8 +19,8 @@
         <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:Logo xml:lang="sv" height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">gävle gavle hig</mdui:Keywords>
         <mdui:Keywords xml:lang="en">gävle gavle hig</mdui:Keywords>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml
index 46f5e92b..9d900fe7 100644
--- a/swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml
@@ -16,8 +16,8 @@
         <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:Logo xml:lang="sv" height="196" width="206">https://idp.his.se/his_se_rubin.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="196" width="193">https://idp.his.se/his_eng_rubin.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">skövde his</mdui:Keywords>
         <mdui:Keywords xml:lang="en">skövde his</mdui:Keywords>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml
index 7109d3cc..3b66c142 100644
--- a/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml
@@ -8,7 +8,7 @@
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
       </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
       </saml:Attribute>
@@ -24,8 +24,8 @@
         <mdui:Description xml:lang="en">The Kristianstad University Login Service is used by employees and students at the university.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.hkr.se/sv/om-hkr/organisation/administration-och-stodverksamhet/it-service/kontoinformation/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.hkr.se/en/study-at-hkr/service-and-support/it-support-for-students/user-name-and-password/</mdui:InformationURL>
-        <mdui:Logo height="84" width="96" xml:lang="sv">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
-        <mdui:Logo height="84" width="96" xml:lang="en">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="84" width="96">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="84" width="96">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>hkr.se</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/idp.ibt.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ibt.cas.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..5745619c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ibt.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.ibt.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-03-22T16:52:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibt.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Biotechnology CAS, v.v.i.</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Biotechnologický ústav AV ČR, v.v.i.</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider IBT AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance BTÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ibt.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ibt.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="64">https://jiftach.cas.cz/loga/logo-btu-44.png</mdui:Logo>
+        <mdui:Logo height="366" width="524">https://jiftach.cas.cz/loga/logo-btu-366.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUMPAWv713tZR1Gu1dYDN+R/Ff2aswDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLmlidC5jYXMuY3owHhcNMTYwMzE4MDczMjQ2WhcN
+MzYwMzE4MDczMjQ2WjAZMRcwFQYDVQQDEw5pZHAuaWJ0LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIZTEMLujf7WZuKhRO3O/ZSjXa9CE/Hg
+OiqfPWv8l/K+hbpfd4pO3mP1Y5BUx5PxmOYosN/XGjFQyEBTNePalBVAPrq98Alr
+9uQIwQuzDda/Ypk0KDS9y+R+5j85k6QE5jFdzlb6bpQmoQNBmqvSHfJjYDFhz2fy
+jqML1GfunwdfkiFxwYtX1jQtBaxzp5f5ptEPo4LI7KUkqoNqHtZDIG7oLZYy7yTR
+NTgcPOm7wkUTcfo8U4968FDk2x9/z6TudUMEgl8ToVGYz4D6880B9gLPaAH/XuyL
+qliSQeVTOD6Or1Xt1Utu0bF4RnqroqRHCLV1DLFWSZMKQrRtjJKwJtkCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLmlidC5jYXMuY3qGJWh0dHBzOi8vaWRwLmlidC5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIUiOnNKx9kW0PEFpI0WvFAA
+egsvMA0GCSqGSIb3DQEBBQUAA4IBAQAsSfb08Y4xlav74IcDid7OZbM2pDW4lZeM
+cdUgixAMQdMCmRkb2rmwz2QhuGLeKCgID6/EIlJBOMozAZP/2PG+TZh/22CcN9fj
+CWCc+akxGbMW1FCgE5VZ8OMqFLVUzvh5fkhCDLc8BmKmafeRCS9b2wnu8rnDNaPv
+mI8BViNwcRds9xmIN0lPkW9eI0QeCz9HEiywiig2MDA2OEQ1uxB56lrCfs5+sU07
+a2eDWPSwOGAqw0PDUVJcxcxL0XpG6YEdnbFWwo9g4WbjlGJNRVPtECyIymTIpEia
+Rz/AYiVVKMJBhTjfy5Qt2syX09PrzoS6djp4aeuSoc+NZPnM8v+8
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibt.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibt.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibt.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibt.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibt.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ibt.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibt.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ibt.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibt.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibt.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUMPAWv713tZR1Gu1dYDN+R/Ff2aswDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLmlidC5jYXMuY3owHhcNMTYwMzE4MDczMjQ2WhcN
+MzYwMzE4MDczMjQ2WjAZMRcwFQYDVQQDEw5pZHAuaWJ0LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIZTEMLujf7WZuKhRO3O/ZSjXa9CE/Hg
+OiqfPWv8l/K+hbpfd4pO3mP1Y5BUx5PxmOYosN/XGjFQyEBTNePalBVAPrq98Alr
+9uQIwQuzDda/Ypk0KDS9y+R+5j85k6QE5jFdzlb6bpQmoQNBmqvSHfJjYDFhz2fy
+jqML1GfunwdfkiFxwYtX1jQtBaxzp5f5ptEPo4LI7KUkqoNqHtZDIG7oLZYy7yTR
+NTgcPOm7wkUTcfo8U4968FDk2x9/z6TudUMEgl8ToVGYz4D6880B9gLPaAH/XuyL
+qliSQeVTOD6Or1Xt1Utu0bF4RnqroqRHCLV1DLFWSZMKQrRtjJKwJtkCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLmlidC5jYXMuY3qGJWh0dHBzOi8vaWRwLmlidC5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIUiOnNKx9kW0PEFpI0WvFAA
+egsvMA0GCSqGSIb3DQEBBQUAA4IBAQAsSfb08Y4xlav74IcDid7OZbM2pDW4lZeM
+cdUgixAMQdMCmRkb2rmwz2QhuGLeKCgID6/EIlJBOMozAZP/2PG+TZh/22CcN9fj
+CWCc+akxGbMW1FCgE5VZ8OMqFLVUzvh5fkhCDLc8BmKmafeRCS9b2wnu8rnDNaPv
+mI8BViNwcRds9xmIN0lPkW9eI0QeCz9HEiywiig2MDA2OEQ1uxB56lrCfs5+sU07
+a2eDWPSwOGAqw0PDUVJcxcxL0XpG6YEdnbFWwo9g4WbjlGJNRVPtECyIymTIpEia
+Rz/AYiVVKMJBhTjfy5Qt2syX09PrzoS6djp4aeuSoc+NZPnM8v+8
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibt.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibt.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Biotechnology CAS</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Biotechnologický ústav AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Biotechnology CAS, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Biotechnologický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ibt.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ibt.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..8498948c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ig.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.ig.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-04-06T13:47: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">ig.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Geophysics of the CAS, v.v.i.</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Geofyzikální ústav AV ČR, v.v.i.</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider IG AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance GFÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ig.cas.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ig.cas.czu</mdui:InformationURL>
+        <mdui:Logo height="44" width="30">https://jiftach.cas.cz/loga/logo-gfu-44.png</mdui:Logo>
+        <mdui:Logo height="146" width="100">https://jiftach.cas.cz/loga/logo-gfu-146.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUW5TBaaB6SfKUuLQgLg+XaF0y3J4wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLmlnLmNhcy5jejAeFw0xNjA0MDUxMzI0MTlaFw0z
+NjA0MDUxMzI0MTlaMBgxFjAUBgNVBAMTDWlkcC5pZy5jYXMuY3owggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvMAk1nwttucujjFQOSyuiS4jPK4M7TVip
+5rRgjz3M7Jmp4X0ZwYCcokPvD1iC+hQFHUiQdEGyvxPcl/3q7lKcrxFhbJUhP4yl
+ZgrJysS91zx9LxEgFeNRIObSGCDLe5+EKRBoyScHhBkBrbIMVhqTjwvIBPuzqmi0
+8sew/BijdVsP9JkGfTr15qw/U6rzE3kh6HY65P5x50D2gLl8dwyAkgdbTdrwZ+Z9
+il1x9sVlVasM+//2OFdhEtjqPAg0M2+azek3NxjYhnsM+ca22yLD5js8cMCVkheZ
+9KA94ic+4hd7NHqgUrmMETQEeOVUbZ5PndJI9lV+whxm5uWtEph9AgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5pZy5jYXMuY3qGJGh0dHBzOi8vaWRwLmlnLmNhcy5j
+ei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUDghEtRanFH4cZQ/+Lclh2VR5bJYw
+DQYJKoZIhvcNAQEFBQADggEBAHwmYx8J6PauVsJg0DZs8d2qXv0vMJObff+rrEEV
+fOCRFu7xGfMNGFq8vIGk8iWeFE4XOk/uUntjuHCRmPiqeBifukhBWPXwwflpmimn
+lYW0fYbfDG5bqOa/fGv2ztq6cpKkWN81KI9bzXAuyYIgzYPXhodUXICa8OFYH2a/
+j91+yHDcBb/Kpl6ReAK4qj9GO0Z2k7dnNsbDtVCdi1DJpDWjElJszPl6dc1+5F6i
+ZY9vTx0lCROCttAMuKYs5fcReLwk+/o2IlfIxdxdAVWXDa74bGoWicPV4IvMYax9
+iAMUVpLKlI8Ml/V8Qgk4piCGEo3pgoP8PlIY9phZL+b1IZo=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ig.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ig.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ig.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ig.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ig.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ig.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ig.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUW5TBaaB6SfKUuLQgLg+XaF0y3J4wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLmlnLmNhcy5jejAeFw0xNjA0MDUxMzI0MTlaFw0z
+NjA0MDUxMzI0MTlaMBgxFjAUBgNVBAMTDWlkcC5pZy5jYXMuY3owggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvMAk1nwttucujjFQOSyuiS4jPK4M7TVip
+5rRgjz3M7Jmp4X0ZwYCcokPvD1iC+hQFHUiQdEGyvxPcl/3q7lKcrxFhbJUhP4yl
+ZgrJysS91zx9LxEgFeNRIObSGCDLe5+EKRBoyScHhBkBrbIMVhqTjwvIBPuzqmi0
+8sew/BijdVsP9JkGfTr15qw/U6rzE3kh6HY65P5x50D2gLl8dwyAkgdbTdrwZ+Z9
+il1x9sVlVasM+//2OFdhEtjqPAg0M2+azek3NxjYhnsM+ca22yLD5js8cMCVkheZ
+9KA94ic+4hd7NHqgUrmMETQEeOVUbZ5PndJI9lV+whxm5uWtEph9AgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5pZy5jYXMuY3qGJGh0dHBzOi8vaWRwLmlnLmNhcy5j
+ei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUDghEtRanFH4cZQ/+Lclh2VR5bJYw
+DQYJKoZIhvcNAQEFBQADggEBAHwmYx8J6PauVsJg0DZs8d2qXv0vMJObff+rrEEV
+fOCRFu7xGfMNGFq8vIGk8iWeFE4XOk/uUntjuHCRmPiqeBifukhBWPXwwflpmimn
+lYW0fYbfDG5bqOa/fGv2ztq6cpKkWN81KI9bzXAuyYIgzYPXhodUXICa8OFYH2a/
+j91+yHDcBb/Kpl6ReAK4qj9GO0Z2k7dnNsbDtVCdi1DJpDWjElJszPl6dc1+5F6i
+ZY9vTx0lCROCttAMuKYs5fcReLwk+/o2IlfIxdxdAVWXDa74bGoWicPV4IvMYax9
+iAMUVpLKlI8Ml/V8Qgk4piCGEo3pgoP8PlIY9phZL+b1IZo=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Geophysics of the CAS</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Geofyzikální ústav AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Geophysics of the CAS, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Geofyzikální ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ig.cas.cz/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ig.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ill.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ill.fr-idp-shibboleth.xml
index d2bf5be7..add8b734 100644
--- a/swamid-interfederations-2.0/idp.ill.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ill.fr-idp-shibboleth.xml
@@ -7,8 +7,8 @@
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ill.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ill.eu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ill.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Institut Laue-Langevin</mdui:DisplayName>
         <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAACcdkwA1MKsAMSabADk4twApIp0APTy7ADc0swAvKqUALyKXACkgmQA7OrsALyWbADUyrwAxKJ8APz69ADMlmQA7OLcAOTa1ADUtpQAxJJkAKR+VADcwqwA/Pb0AMSypAC0hlwAzKZ8AKR6VADUxrwAxJ58APT29ADc1swArIJUAPTq5ADcyrQA/P78AOzm3ADElmQAxLakAJx6VADUxrQAzJpkAOTm5AC0ilwA9PL0ALyOXAC8lnQA1MrEAMSihAD8+vwA5N7UAMymhADc1tQArIJcAPTu7ADs5uQAxJZsAMS2rAAAAMUAAAASAAAAAAA4AJgAAMWQAAASSgAAAAAAeAJmAAEkAAAA9wAAAHcAANQ3BADHKMYAEvQSAAB3AADmoNgAK2/FAOX7EgB3dwAANIaWAABGUgAA9E0AwHcAAPh+sgBbRv8AFPT/AAB3/wAAAAAAAAAAAAAAAAAAAAAAXAi5AAACjwBQAEoAAAAAAHIIWAAAYPQAbxgSAAAAAABntk4AAMUAAHISAAAAAAAAYQAEAAAAxgBtABIAAAAAACAA2AAAAMUARgASAAAAAABpTvMAAAAZAGwA5QAAAHcAZUMAAAA6AABzXAAAAEQAAPtvKAAzY+QA5XUVAHdtAAAAZf8AAG7/AAB0/wAAc/8AKCAAAORhAAAVbgAAAGQAACggAADkUwAAFWUAAAB0AAAAdAAA4GkAABVuAAAAZwAAAHNqAOBcAAAVQQAAAGQAAABtUAAAaQMAAG4AAABpAAAHc7gAAHRiAAByFAAAYQAAAHRkAMZlIgASdeUAAHJ3AABcAAAATQEAAGUAAABzAAAA/LgAAMRiAAASAQAAAAAAAJUAAAAsAAAA5RQAAHcAAAAALAAAAMMAAAASAAAAAABUAAAAFwAAAOUAAAB3AAAATrjwAABi+gAAFBIAAAAAAP80AgD/1iQA//T3AP93dwBO8/gAABlUAADl9gAAd3cAWAD/APQA/wASAP8AAAD/AAAojQAA5BYAABX0AAAAdwAkACEAxgAeABIA5QAAAHcA2OAAAGDEAABKEhQAAAAAAAQAAADGAAAAEgAAAAAAAACX8LgAUvpiAE0SFAAAAAAAOAIAAMYkAQAS9wAAAHcAAADwHAAAdxgAAPbmAAB3dwCu/wAAxv8AABL/AAAA/wAAsDQEAP/WAAD/9AAAf3cAAGDzAwDGGQAAEuUAAAB3AADzAAAAGQAAAOUAAAB3AAAAANQAAAB3AAAA5AAAAHcAAPMABAAZAAAA5QAAAHcAAAABMAMAAAAAAAAAAAAAdwAANWAEAHHFAABGEgAAAAAAAGAwAgDGxQAAEhIAAAAAAABgAwAAxk0AABIFAAAAAQAAKA8oDygPKA8oDygPKA8oDygoKCgoKCgoKCgoKCgoKCgoDygPKA8oDygPKA8oDygPKCgoKCgoKCgoKCgoKCgoKCw0GhoaJhoAAAAAABQYEyghIiIKBBAiMC42IiIbNAgoMiIiIhcKIjAbCiIiJQAqKBMgIjAeESIiLhAiIhsmHygTASIiNgwiIikMIiIWCRQoJBkgNSkXFiIWFzAiIgcmKA8LAQYGOAMiIjMGIiIQGigPExIwDh0nIiIdDDAiBQ0oKA83GQ0cCxkcHDcNDRwLKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgPJCQTExMTExMTExMTJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</mdui:Logo>
diff --git a/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml
index d13562a1..1d57f144 100644
--- a/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml
@@ -15,8 +15,8 @@
         <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:Logo xml:lang="sv" height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">http://documents.irf.se/get_document.php?group=Computer%26docid=302</mdui:PrivacyStatementURL>
         <mdui:Keywords xml:lang="sv">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
         <mdui:Keywords xml:lang="en">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
diff --git a/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml
index 825b2677..36435ba1 100644
--- a/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml
@@ -18,8 +18,8 @@
         <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:Logo xml:lang="sv" height="50" width="344">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="376">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>gu.se</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml
index 202d3805..514216cb 100644
--- a/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml
@@ -15,8 +15,8 @@
         <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:Logo xml:lang="sv" height="110" width="127">https://idp.it.su.se/idp/img/su-logo-sv_OLD.gif</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="110" width="127">https://idp.it.su.se/idp/img/su-logo-en_OLD.gif</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">http://www.su.se/regelboken/bok-3/teknik</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.su.se/rules/book-3/3-3-technics</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml
index cd11552d..1c3fea89 100644
--- a/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml
@@ -16,8 +16,8 @@
         <mdui:InformationURL xml:lang="sv">http://www.kb.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.kb.se</mdui:InformationURL>
         <mdui:Logo height="488" width="516">https://idp.kb.se/idp/images/logga_FB.gif</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">Kungliga+biblioteket national+library+of+sweden </mdui:Keywords>
-        <mdui:Keywords xml:lang="en">Kungliga+biblioteket national+library+of+sweden </mdui:Keywords>
+        <mdui: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>
diff --git a/swamid-interfederations-2.0/idp.kirkleescollege.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.kirkleescollege.ac.uk-entity.xml
index 70199015..2c522952 100644
--- a/swamid-interfederations-2.0/idp.kirkleescollege.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.kirkleescollege.ac.uk-entity.xml
@@ -4,95 +4,188 @@
 		This is a Shibboleth IdP for Kirklees College.
 	-->
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-19T15:38:46.844016Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kirkleescollege.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Kirklees College</mdui:DisplayName>
+        <mdui:Logo height="67" width="137">https://www.kirkleescollege.ac.uk/wp-content/uploads/2015/06/kcLogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </Extensions>
-    <KeyDescriptor>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIEgDCCA2igAwIBAgIRALyJOa+uq/oIUbNaLn2KXiwwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MDMwMDAwMDBaFw0xNjA0MDIyMzU5NTlaMEcxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZaWRwLmtpcmts
+						MIIDUzCCAjugAwIBAgIUPzSZlLFegyJ/xf53eryEDjcKM9EwDQYJKoZIhvcNAQEL
+						BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
+						MzAzMTAxODQ3WhcNMzYwMzAzMTAxODQ3WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
 						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==
+						AKFBdTJWYZwbKzqpd8kbX4j1SX+EN2WBSYWvgYJLQFFkwMcxKjPzEJUPoR3aMu5T
+						oTEm+oTERSALbbddvE7pnXSqYOWK446LwsyeFLKF8h7xYreM85yPmorsFAaaTUuI
+						wvx59BHDuSkiVZwwsm3+WB14Ahcg429whwNY9apF1udu5xE6BMF7I+QtUNJCDhz1
+						vgVS41JfkQiwbNPZlvfe8S14s3bWOIwp9l+G2f8cRNH5Uf5y9ZuX2tB8eDAZ6cDT
+						ID6udXsErJSCbosX4uykvlnD6Djr+7TQNwJqVZFRNbWki/sl41GYuqvlM/A/u04H
+						n2MCvHwjUQTtBrTpIZZXxpUCAwEAAaN7MHkwHQYDVR0OBBYEFLpm52vzFVDyJS4o
+						hPpCfXJG6n0jMFgGA1UdEQRRME+CGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVr
+						hjFodHRwczovL2lkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9s
+						ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBREprxYckkBIaZYmAYDei1C2pe23kl9exH
+						4aWKmPNARm7o4Cy7dd3j3uwC8St+4qEKCpFQXy2Dat/WcXoXNYUqARRvF5yPNyo7
+						zyIajiKzdHTKfb6fUAfStmRQ2f7iWVCB25A/e1vo3AnoJ3S0X7YBo8k6uR7Vh4Tv
+						ezlyLCERRgKTuhxVI2eZ6/pO7Nxfk+m6VznnRQY/uyOUdq5hYT8kR7IC8QEJN0uM
+						JBwwLSL7JuEb/lyeuxXMQ0Uadl2f68HdgycsUKbGCRdskzL49x1MNcyqrT9e+FFM
+						dgIVva94fIIj02YnTFHvjX1CIoHAh/0Tg/xMHLUeJyrCLp9i8iJG
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <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"/>
-    <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"/>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUzCCAjugAwIBAgIUd97fOFDggCwIB+n7K8vwH2yP6mUwDQYJKoZIhvcNAQEL
+						BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
+						MzAzMTAxODQ2WhcNMzYwMzAzMTAxODQ2WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
+						ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AOD7ENmi+diQEZsfujuo48nhfyIImo63I1dxn8DcDkMAwQu5Bp01bOIoB6fvJd6+
+						yxUI5Ny7cH6BIkfoGC/4kc+9YaTmjdQ2Lqz5FFB6sZNx/zTK6ovTS0M855KFbTjx
+						iaomSW/ZA4khQWLDpNf7kSbqRNYprwvB84ySF5IDhhy1j6uMsTTBzfWVswbq7ioo
+						AxWHH/F1URF8Ke2zyJPZcVmESj6hb0kaJ65neFkdKdk1tePySVT1iiqTZXW+nbR1
+						q+2JbC8CG0uzKn6uqcnBwsjMw/tHqnzL4yoXyHsg1bzNpN+Fhjvqxiqre+0VN01D
+						qCZVnIGvcPPI1JQXtGBUgRECAwEAAaN7MHkwHQYDVR0OBBYEFHR4kkaJLgI7EJAa
+						m+vQbnIupiAyMFgGA1UdEQRRME+CGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVr
+						hjFodHRwczovL2lkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9s
+						ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQC6blnSTG9YG9r1kyqXwX46qtU/R3GDzZNQ
+						pHSMzTZ5u5B6t3/UM9bIPlHtPS6hilFY5Hmr+VsPA0y0xAX6C35UiNAEk8U6LD4O
+						AWvkqBQEMsoANTZa2g2hbpyEBdF2eTJZcxrSbDfrQ6zFRavwb1yeuFpp61CJEKNB
+						002kcyWHo6I4ywgwvKjy0XeUjHakskUSkHz1/Vk/jCjOP7+BX5kptY0gbh/NLzri
+						uLubDQXxFYEriQdqBU7xzKtZO8Uvh4bHSgbh2PlsHwNrn3Pz1j7HJUUinQjx11F1
+						uXzeRs4SkLVanB/ZfQiRhdtDaRsNRrXMBWDLn/zeJiTcyusUtHtf
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDVDCCAjygAwIBAgIVAKB3QrzbWC6UDhYtgWKIpucJuo+aMA0GCSqGSIb3DQEB
+						CwUAMCUxIzAhBgNVBAMMGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrMB4XDTE2
+						MDMwMzEwMTg0N1oXDTM2MDMwMzEwMTg0N1owJTEjMCEGA1UEAwwaaWRwMy5raXJr
+						bGVlc2NvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCBPFW/kyCkFVmfkrRrJYeZbtZZ+idr82BMiORf3wNIFRVe0Dzcgm3G9zdiI/tv
+						Y32ipWUS2msYQXXJ8CGU2GcgNjSCUUffGc/Mi5UbKXZsOZWshBavumBHELDahOKc
+						F1V8msTgiKTdckuvkwjyLAokVDGWeZ1HBlDF1EBeKxPxDTnIeknlE4suuFPLHKkQ
+						kCup+ncBh8ZODGInHHb57xonZKxubqZPRk6K3za6K6eW4uu7R6cigZDUmoNMi/QN
+						SrFvyXG+5e+8OA6MbttCNreVto2AAm0cb7OWtLmYYCz95G4UtFRRzScFJWePbnGu
+						KzYL080NVr+ugb/+ttkfbNG1AgMBAAGjezB5MB0GA1UdDgQWBBSJF8N8bCvvPNCu
+						fB3kL4jFg8jIrDBYBgNVHREEUTBPghppZHAzLmtpcmtsZWVzY29sbGVnZS5hYy51
+						a4YxaHR0cHM6Ly9pZHAzLmtpcmtsZWVzY29sbGVnZS5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAAqmGm2DuWPXogXtQzwMy/eymOtwG1mKG
+						FUBGI6RKzFBhv0IC0qnwzsJ931x/Y79e9usKreMxaWJinOm8IcKDUzyHBrtosmbi
+						T+b3BxArTXDAWnKuel4OVuVUJnndfBcWvxJrGmj3ueb/S2EsbkmnwXMXawXFATV8
+						IAdC/EErq8wNXbbRlkbeX+ibMsgHDMofY/WL0QmC+1kJO8KGoNPOje4aDYzvkCcs
+						f/H76DoF7VcK7V5hujvHlb0P51EAA15gDfywo8GT3S8M5OrSYmFoL8p0/NrQ16lB
+						hRIYrS+7nU8Dmaso2COWvd0q91Gb0tAQx+Qamj5LcT+mdcQ636jf0g==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kirkleescollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kirkleescollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <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"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kirkleescollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
   </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kirkleescollege.ac.uk</shibmd:Scope>
     </Extensions>
-    <KeyDescriptor>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIEgDCCA2igAwIBAgIRALyJOa+uq/oIUbNaLn2KXiwwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MDMwMDAwMDBaFw0xNjA0MDIyMzU5NTlaMEcxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZaWRwLmtpcmts
+						MIIDUzCCAjugAwIBAgIUPzSZlLFegyJ/xf53eryEDjcKM9EwDQYJKoZIhvcNAQEL
+						BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
+						MzAzMTAxODQ3WhcNMzYwMzAzMTAxODQ3WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
 						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==
+						AKFBdTJWYZwbKzqpd8kbX4j1SX+EN2WBSYWvgYJLQFFkwMcxKjPzEJUPoR3aMu5T
+						oTEm+oTERSALbbddvE7pnXSqYOWK446LwsyeFLKF8h7xYreM85yPmorsFAaaTUuI
+						wvx59BHDuSkiVZwwsm3+WB14Ahcg429whwNY9apF1udu5xE6BMF7I+QtUNJCDhz1
+						vgVS41JfkQiwbNPZlvfe8S14s3bWOIwp9l+G2f8cRNH5Uf5y9ZuX2tB8eDAZ6cDT
+						ID6udXsErJSCbosX4uykvlnD6Djr+7TQNwJqVZFRNbWki/sl41GYuqvlM/A/u04H
+						n2MCvHwjUQTtBrTpIZZXxpUCAwEAAaN7MHkwHQYDVR0OBBYEFLpm52vzFVDyJS4o
+						hPpCfXJG6n0jMFgGA1UdEQRRME+CGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVr
+						hjFodHRwczovL2lkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9s
+						ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBREprxYckkBIaZYmAYDei1C2pe23kl9exH
+						4aWKmPNARm7o4Cy7dd3j3uwC8St+4qEKCpFQXy2Dat/WcXoXNYUqARRvF5yPNyo7
+						zyIajiKzdHTKfb6fUAfStmRQ2f7iWVCB25A/e1vo3AnoJ3S0X7YBo8k6uR7Vh4Tv
+						ezlyLCERRgKTuhxVI2eZ6/pO7Nxfk+m6VznnRQY/uyOUdq5hYT8kR7IC8QEJN0uM
+						JBwwLSL7JuEb/lyeuxXMQ0Uadl2f68HdgycsUKbGCRdskzL49x1MNcyqrT9e+FFM
+						dgIVva94fIIj02YnTFHvjX1CIoHAh/0Tg/xMHLUeJyrCLp9i8iJG
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kirkleescollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kirkleescollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUzCCAjugAwIBAgIUd97fOFDggCwIB+n7K8vwH2yP6mUwDQYJKoZIhvcNAQEL
+						BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
+						MzAzMTAxODQ2WhcNMzYwMzAzMTAxODQ2WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
+						ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AOD7ENmi+diQEZsfujuo48nhfyIImo63I1dxn8DcDkMAwQu5Bp01bOIoB6fvJd6+
+						yxUI5Ny7cH6BIkfoGC/4kc+9YaTmjdQ2Lqz5FFB6sZNx/zTK6ovTS0M855KFbTjx
+						iaomSW/ZA4khQWLDpNf7kSbqRNYprwvB84ySF5IDhhy1j6uMsTTBzfWVswbq7ioo
+						AxWHH/F1URF8Ke2zyJPZcVmESj6hb0kaJ65neFkdKdk1tePySVT1iiqTZXW+nbR1
+						q+2JbC8CG0uzKn6uqcnBwsjMw/tHqnzL4yoXyHsg1bzNpN+Fhjvqxiqre+0VN01D
+						qCZVnIGvcPPI1JQXtGBUgRECAwEAAaN7MHkwHQYDVR0OBBYEFHR4kkaJLgI7EJAa
+						m+vQbnIupiAyMFgGA1UdEQRRME+CGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVr
+						hjFodHRwczovL2lkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9s
+						ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQC6blnSTG9YG9r1kyqXwX46qtU/R3GDzZNQ
+						pHSMzTZ5u5B6t3/UM9bIPlHtPS6hilFY5Hmr+VsPA0y0xAX6C35UiNAEk8U6LD4O
+						AWvkqBQEMsoANTZa2g2hbpyEBdF2eTJZcxrSbDfrQ6zFRavwb1yeuFpp61CJEKNB
+						002kcyWHo6I4ywgwvKjy0XeUjHakskUSkHz1/Vk/jCjOP7+BX5kptY0gbh/NLzri
+						uLubDQXxFYEriQdqBU7xzKtZO8Uvh4bHSgbh2PlsHwNrn3Pz1j7HJUUinQjx11F1
+						uXzeRs4SkLVanB/ZfQiRhdtDaRsNRrXMBWDLn/zeJiTcyusUtHtf
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDVDCCAjygAwIBAgIVAKB3QrzbWC6UDhYtgWKIpucJuo+aMA0GCSqGSIb3DQEB
+						CwUAMCUxIzAhBgNVBAMMGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrMB4XDTE2
+						MDMwMzEwMTg0N1oXDTM2MDMwMzEwMTg0N1owJTEjMCEGA1UEAwwaaWRwMy5raXJr
+						bGVlc2NvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCBPFW/kyCkFVmfkrRrJYeZbtZZ+idr82BMiORf3wNIFRVe0Dzcgm3G9zdiI/tv
+						Y32ipWUS2msYQXXJ8CGU2GcgNjSCUUffGc/Mi5UbKXZsOZWshBavumBHELDahOKc
+						F1V8msTgiKTdckuvkwjyLAokVDGWeZ1HBlDF1EBeKxPxDTnIeknlE4suuFPLHKkQ
+						kCup+ncBh8ZODGInHHb57xonZKxubqZPRk6K3za6K6eW4uu7R6cigZDUmoNMi/QN
+						SrFvyXG+5e+8OA6MbttCNreVto2AAm0cb7OWtLmYYCz95G4UtFRRzScFJWePbnGu
+						KzYL080NVr+ugb/+ttkfbNG1AgMBAAGjezB5MB0GA1UdDgQWBBSJF8N8bCvvPNCu
+						fB3kL4jFg8jIrDBYBgNVHREEUTBPghppZHAzLmtpcmtsZWVzY29sbGVnZS5hYy51
+						a4YxaHR0cHM6Ly9pZHAzLmtpcmtsZWVzY29sbGVnZS5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAAqmGm2DuWPXogXtQzwMy/eymOtwG1mKG
+						FUBGI6RKzFBhv0IC0qnwzsJ931x/Y79e9usKreMxaWJinOm8IcKDUzyHBrtosmbi
+						T+b3BxArTXDAWnKuel4OVuVUJnndfBcWvxJrGmj3ueb/S2EsbkmnwXMXawXFATV8
+						IAdC/EErq8wNXbbRlkbeX+ibMsgHDMofY/WL0QmC+1kJO8KGoNPOje4aDYzvkCcs
+						f/H76DoF7VcK7V5hujvHlb0P51EAA15gDfywo8GT3S8M5OrSYmFoL8p0/NrQ16lB
+						hRIYrS+7nU8Dmaso2COWvd0q91Gb0tAQx+Qamj5LcT+mdcQ636jf0g==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">Kirklees College</OrganizationName>
diff --git a/swamid-interfederations-2.0/idp.kkh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kkh.se-idp-shibboleth.xml
index 01681b16..e691b417 100644
--- a/swamid-interfederations-2.0/idp.kkh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kkh.se-idp-shibboleth.xml
@@ -18,8 +18,8 @@
         <mdui:DisplayName xml:lang="en">Royal Institute of Art</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Kungl. Konsthögskolan (KKH)</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for the Royal Institute of Art (KKH)</mdui:Description>
-        <mdui:Keywords xml:lang="sv">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art </mdui:Keywords>
-        <mdui:Keywords xml:lang="en">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art </mdui:Keywords>
+        <mdui:Keywords xml:lang="sv">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art</mdui:Keywords>
         <mdui:InformationURL xml:lang="sv">http://kkh.se/index.php/sv/om-kkh</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://kkh.se/index.php/en/about-kkh</mdui:InformationURL>
         <mdui:Logo height="110" width="404">https://idp.kkh.se/idp/images/kkh.png</mdui:Logo>
diff --git a/swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml
index ed164dbb..5f7b7491 100644
--- a/swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml
@@ -15,8 +15,8 @@
         <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:Logo xml:lang="sv" height="141" width="313">https://idp.kmh.se/idp/images/logo.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="141" width="313">https://idp.kmh.se/idp/images/logo.jpg</mdui:Logo>
         <mdui:Keywords xml:lang="sv">kmh kungliga+musikhogskolan royal+college+of+music stockholm kungl.+musikhögskolan+i+stockholm</mdui:Keywords>
         <mdui:Keywords xml:lang="en">kmh kungliga+musikhogskolan royal+college+of+music stockholm kungl.+musikhögskolan+i+stockholm</mdui:Keywords>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/idp.konstfack.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.konstfack.se-idp-shibboleth.xml
index 1fdc86ec..950b6188 100644
--- a/swamid-interfederations-2.0/idp.konstfack.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.konstfack.se-idp-shibboleth.xml
@@ -16,8 +16,8 @@
         <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:Logo xml:lang="sv" height="142" width="142">https://idp.konstfack.se/idp/images/logo.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="142" width="142">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>
diff --git a/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml
index 8212d8fa..e4f03074 100644
--- a/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml
@@ -16,8 +16,8 @@
         <mdui:InformationURL xml:lang="sv">http://lnu.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://lnu.se/?l=en</mdui:InformationURL>
         <mdui:Logo height="55" width="361">https://demo.idp.lnu.se/idp/images/logo_swamid.png</mdui:Logo>
-        <mdui:Logo height="55" width="361" xml:lang="sv">https://demo.idp.lnu.se/idp/images/logo_swamid.png</mdui:Logo>
-        <mdui:Logo height="55" width="361" xml:lang="en">https://demo.idp.lnu.se/idp/images/logo_swamid.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="55" width="361">https://demo.idp.lnu.se/idp/images/logo_swamid.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="55" width="361">https://demo.idp.lnu.se/idp/images/logo_swamid.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">lnu linné linnæus linne linnaeus linneuniversitetet linnaeus+university</mdui:Keywords>
         <mdui:Keywords xml:lang="en">lnu linné linnæus linne linnaeus linneuniversitetet linnaeus+university</mdui:Keywords>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/idp.lu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lu.se-idp-shibboleth.xml
deleted file mode 100644
index 0fff0796..00000000
--- a/swamid-interfederations-2.0/idp.lu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?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>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn: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">lu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Lunds universitet (Gammal)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lund University (Old)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Gammal IDP - Använd inte!</mdui:Description>
-        <mdui:Description xml:lang="en">Old IDP - do not use!</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 (Gammal)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Lund University (Old)</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.mah.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml
index 3175db5d..031081c7 100644
--- a/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml
@@ -16,8 +16,8 @@
         <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:Logo xml:lang="sv" height="195" width="132">http://cdn.mah.se/images/header/sv/logo_sv.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="195" width="132">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>
diff --git a/swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml
index 7c6758d9..47ecea14 100644
--- a/swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml
@@ -11,8 +11,8 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="de">Medizinische Universität Wien</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Medical University of Vienna</mdui:DisplayName>
-        <mdui:Logo height="82" width="172">https://idp.meduniwien.ac.at/idp/images/meduni_logo.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp.meduniwien.ac.at/idp/favicon.ico</mdui:Logo>
+        <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">
diff --git a/swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..39cd1a8e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.mendelu.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.mendelu.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T15:19:47Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mendelu.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Mendel Univerzity in Brno </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Mendelova univerzita v Brně</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Mendel Univerzity in Brno</mdui:Description>
+        <mdui:Description xml:lang="cs">Poskytovatel identity Mendelovy univerzity v Brně</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.mendelu.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.mendelu.cz/</mdui:InformationURL>
+        <mdui:Logo height="100" width="150">https://idp.mendelu.cz/mendelu-logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDlzCCAn+gAwIBAgIJAJDI3wy+XpHDMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDmlkcC5tZW5kZWx1LmN6MB4XDTE2MDMyOTEwNDE0MFoXDTM2MDMyNDEwNDE0
+MFowGTEXMBUGA1UEAxMOaWRwLm1lbmRlbHUuY3owggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDZVvr0rRSzqYtQwJFLlnemOD8otdNMGZvQg3wMF+iiasJH
+zRvjQSK/faikBr4bg4srewOUW0dPAmB5tQWxRAs/Nm2v9vwalHktD97ccZ8J9oHo
+VMsm7JKiGFozkVRHXD//EHzD+UwtuwNZvrwTysGSnIFMg7GVFSpi0ByvLu+To5gl
+5mjNppiMqRXDnKiNtbUncwD2U+0/h5/GN0flI4mNZocR2DY2qyYGXF41MMxbsUjI
+cIghx2H2vWdF5G1YTY6qye6E8m9xVClQc/KNm00YqrjIElFwxeP0zi5GV6mO8PEP
+Ex99Q1yyos8lyQpmM37MvLnX2B8g/fD1cYdowDEDAgMBAAGjgeEwgd4wgbwGA1Ud
+EQSBtDCBsYIOaWRwLm1lbmRlbHUuY3qGJWh0dHBzOi8vaWRwLm1lbmRlbHUuY3ov
+aWRwL3NoaWJib2xldGiCEmFsaWJhYmEubWVuZGVsdS5jeoYpaHR0cHM6Ly9hbGli
+YWJhLm1lbmRlbHUuY3ovaWRwL3NoaWJib2xldGiCEG1iZGV2Lm1lbmRlbHUuY3qG
+J2h0dHBzOi8vbWJkZXYubWVuZGVsdS5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
+FgQU1I2Hy25eKS9D3EIf+kjHt+7tbwgwDQYJKoZIhvcNAQEFBQADggEBANgEHcEi
+l6c+DVsixfpPKloIAaGTnd6rk3VrEoW22zhPmEYh8TZiZl1Ie2Ldbpbql/b7C8iK
+T/QyVEayGDuyLgehZTfLshC+EWtxsWT82QONdmhVutLYc5HEMBEvuiHYuQwqX3FS
+jJNONzPvn6QsiC5LevJmX9I3vgIeEF3wbOgwdqnfzIl5k4DuGhDNdpv9iy3zwM+H
+ly0Ky8TPxWhwkcZo83muhNJk5LuZG8VblckmvsGR27bt9wty60PqE1Wb4zlguTzY
+eBFJcQNHXyofYwsQlK2LyCnlOlpQUtbXe5/BcXKA9pp+RnjZAB9dVpY/KJ6hy6BQ
+/9z9n5iDjFjm8dk=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mendelu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mendelu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mendelu.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mendelu.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mendelu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mendelu.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mendelu.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDlzCCAn+gAwIBAgIJAJDI3wy+XpHDMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDmlkcC5tZW5kZWx1LmN6MB4XDTE2MDMyOTEwNDE0MFoXDTM2MDMyNDEwNDE0
+MFowGTEXMBUGA1UEAxMOaWRwLm1lbmRlbHUuY3owggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDZVvr0rRSzqYtQwJFLlnemOD8otdNMGZvQg3wMF+iiasJH
+zRvjQSK/faikBr4bg4srewOUW0dPAmB5tQWxRAs/Nm2v9vwalHktD97ccZ8J9oHo
+VMsm7JKiGFozkVRHXD//EHzD+UwtuwNZvrwTysGSnIFMg7GVFSpi0ByvLu+To5gl
+5mjNppiMqRXDnKiNtbUncwD2U+0/h5/GN0flI4mNZocR2DY2qyYGXF41MMxbsUjI
+cIghx2H2vWdF5G1YTY6qye6E8m9xVClQc/KNm00YqrjIElFwxeP0zi5GV6mO8PEP
+Ex99Q1yyos8lyQpmM37MvLnX2B8g/fD1cYdowDEDAgMBAAGjgeEwgd4wgbwGA1Ud
+EQSBtDCBsYIOaWRwLm1lbmRlbHUuY3qGJWh0dHBzOi8vaWRwLm1lbmRlbHUuY3ov
+aWRwL3NoaWJib2xldGiCEmFsaWJhYmEubWVuZGVsdS5jeoYpaHR0cHM6Ly9hbGli
+YWJhLm1lbmRlbHUuY3ovaWRwL3NoaWJib2xldGiCEG1iZGV2Lm1lbmRlbHUuY3qG
+J2h0dHBzOi8vbWJkZXYubWVuZGVsdS5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
+FgQU1I2Hy25eKS9D3EIf+kjHt+7tbwgwDQYJKoZIhvcNAQEFBQADggEBANgEHcEi
+l6c+DVsixfpPKloIAaGTnd6rk3VrEoW22zhPmEYh8TZiZl1Ie2Ldbpbql/b7C8iK
+T/QyVEayGDuyLgehZTfLshC+EWtxsWT82QONdmhVutLYc5HEMBEvuiHYuQwqX3FS
+jJNONzPvn6QsiC5LevJmX9I3vgIeEF3wbOgwdqnfzIl5k4DuGhDNdpv9iy3zwM+H
+ly0Ky8TPxWhwkcZo83muhNJk5LuZG8VblckmvsGR27bt9wty60PqE1Wb4zlguTzY
+eBFJcQNHXyofYwsQlK2LyCnlOlpQUtbXe5/BcXKA9pp+RnjZAB9dVpY/KJ6hy6BQ
+/9z9n5iDjFjm8dk=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mendelu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mendelu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Mendel Univerzity in Brno</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Mendelova univerzita v Brně</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Mendel Univerzity in Brno</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Mendelova univerzita v Brně</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mendelu.cz/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.mendelu.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Banzet</md:SurName>
+    <md:EmailAddress>michael.banzet@mendelu.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml
deleted file mode 100644
index d012e423..00000000
--- a/swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mijnhelicon.nl/nidp/saml2/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-05T17:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">Helicon Opleidingen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Helicon Opleidingen</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Helicon Opleidingen</mdui:Description>
-        <mdui:Description xml:lang="en">Helicon Opleidingen</mdui:Description>
-        <mdui:Logo height="41" width="108">https://static.surfconext.nl/logos/idp/helicon.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Helicon Opleidingen MBO</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Helicon Opleidingen MBO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/9ab8d5ff3391fff206e4c5c9b138c9d6"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Helicon Opleidingen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Helicon</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.helicon.nl</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml
index d9cc2778..c0bb349b 100644
--- a/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml
@@ -14,8 +14,8 @@
         <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:Logo xml:lang="sv" height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>nordu.net</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml
index 3fce7dfb..26a8d67b 100644
--- a/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml
@@ -45,38 +45,6 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <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>
-    </KeyDescriptor>
     <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"/>
     <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"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -123,38 +91,6 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <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>
-    </KeyDescriptor>
     <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"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml
index 19329003..5e9b1cf1 100644
--- a/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml
@@ -62,7 +62,7 @@ mSq9+fohezZUYgCirIJuORsZiubp0lExD9/P9hYK6tNtxCeKpOrFKfqDonlcFwq4
   <md:Organization>
     <md:OrganizationName xml:lang="en">Maynooth University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Maynooth University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://mu.ie</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.maynoothuniversity.ie</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Jason</md:GivenName>
diff --git a/swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..12c8aca3
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.pasteur.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-06T15:53:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pasteur.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institut Pasteur</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KTMInWQAAAxZJREFUOBFNU0toVEkUvbfqvf69MSZqT4vjh8nCvzCMoMysXEhAgpKFUSHJ+KENuFB36kobXQjD4IyCC02Q2Om40I0rQZAZRUEFFxpFiYtEEn8d2yZmjN39XtW93uo2YMGjbtU799xzP4Xw/eq8quHaDlu/6szFFgbLFkXWJJFpSmNyulhNVGHNc4ZcjmbdkHOgAHKAuRMMgJzp6fvZMhxAwDZEXsIMTQIuM+J5o/W5qYG9UwCMDQKcNRrH+V39uxXS3+inWoAiuURgG30SdCcRGUB1WCEOTBay1xseQjuRX7xx3tzXE0FhYMtPAfSHJOrI1r1ReR6B7Srls1cWdPc/0EHLRpopl0BhG0E0+TF/4A2+H/JtlaJy+39nm0fNPK+FK1HEqFD7WqK/+FCbuy6T+Dif2BuWqBlAUcXULSmuFsg/SnvRkeHS1sAwjKGtjbOX8AWo60DAEVdUy0rLHUsKsqEIgJIYm4yxf6j0zhv5bfc7Xo1MN29vD2+2RmF4Qn7+j7GUbI2FXkycMUI/ITQ0huS/FWOtlHCX+nXP+PrWlLcqkwwv/5toW14ayp6UQv1OX6YeOLGOgk3ozDSYEJTiXqvsZowF0h1eqd5ZnfpMFljHflEMD9NdFw8WB7PPPhT2/0bKHHQExLUZAR9DNq1kVIjMpzmquF8/KIOq4sKwDV2b5qAfP5fu6XskVc8mIFV1qPLQoemQTN4CdoDim6B0XBQ5eaEShhFp2ydx9oSF2NRIzPU6MacvpOiCI8j05ANf+3d1LDgjRUwI3kiXUBryVBWv7BuV+PekUAJFGQJUbE3ExgVnN4UQuUlmSFJdNjdGXRojCgquL64/f0lkZ3ryOYAMX31a62AVD1yW5tu1kWAeR9WXRMlLSh6GKhX235aMjmMsCZKf67mScgse42LPLs9pRhWLkwlDRu4tD3VPOwLHDkJyCqLqUcmvKMcKhxV5WvB41lv2LzKZlm3tiVbcXhrsvQM5dmFcKg29k4PZP2U811nWG1jxinSt6ZgjKC2dmEFNHWRp7Y+15g3FfO8tpxxySF8BHZ54NL0wTpgAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.pasteur.fr/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Institut Pasteur's staff</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Institut Pasteur</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnel de l'Institut Pasteur</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDJDCCAgygAwIBAgIVAM8NHj+g2+LDA3cgW3pLZnacQa9QMA0GCSqGSIb3DQEB BQUAMBkxFzAVBgNVBAMTDmlkcC5wYXN0ZXVyLmZyMB4XDTEzMTAxNTEwMzQzN1oX DTMzMTAxNTEwMzQzN1owGTEXMBUGA1UEAxMOaWRwLnBhc3RldXIuZnIwggEiMA0G CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvDkYEJsGc0q44FM+vk1gvd2olN2Oa QS5MEJrvSsgNaL6b8bzgPhqOCfAeSLc9mVmp+j7MuFWQEboy0OAmsFzSD3YVBipJ AMa8+bwk5jhvB3BJ/YbsjSYdx3nP/W3um9kjx0L44bfrsFltA8ShGx3TzgFkYk5D U8yynYz0azOBTrswm+OMKNbFf6kg3ApWsIX0EsYwtzKrbF/NKlCiUovdj9/ZEZU3 Ofk07Q0Ugi21HusAM9wWBhVmeuOnnIxR+4lWLwocfUBFDsSyyD9mjxqXMqU24N7R vs/mSIYGZe18H8zS26YS0IMVzlPVZSIF8j9XMFLTvprk28SYXnc0cxmlAgMBAAGj YzBhMEAGA1UdEQQ5MDeCDmlkcC5wYXN0ZXVyLmZyhiVodHRwczovL2lkcC5wYXN0 ZXVyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRgZUBj6mFNK1rhpOxmhCa5 42xG9TANBgkqhkiG9w0BAQUFAAOCAQEAo3GFGV2Y3sb2QENh8ZJI+4hG2Pg4Adoj umDi7S6mXttNFcoC3LPVQuC/nsZsSz0ssmgHNFyvXOpLvITrUftdtS+zmCFwGlBV nWXF0sk2inc2xJRwYz6WolTj8I8J4Y2XvRMKu53Ysg4JPioE2nNtJs5PVsbkLpVU sF9M03mahyLDFNydv7ZTesTkN9r5+3WjZJVSQw5O8qAKllCo4t7+LS4JIl7Vg7a0 j3JcaueG6lbWSn82ib/oZcGGC8TpM4BrD+hrRuMrsHv0vuoFuzOlLjZVD89XuuLO GE+WCIfpIz0LEDbzBnZwm6z24itrreAnY1PWyGfl0Pj8fPDxoyaZNw==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pasteur.fr/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pasteur.fr/idp/profile/SAML2/POST/SLO"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pasteur.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pasteur.fr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institut Pasteur</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institut Pasteur</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pasteur.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@pasteur.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.politecnica.edu.co-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.politecnica.edu.co-idp-shibboleth.xml
new file mode 100644
index 00000000..642c69a5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.politecnica.edu.co-idp-shibboleth.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.politecnica.edu.co/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://colfire.co" registrationInstant="2016-04-04T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">http://colfire.co/?page_id=55</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">politecnica.edu.co</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">POLITECNICA - Corporacion Politecnica Nacional de Colombia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">POLITECNICA - CorporaciÃ³n PolitÃ©cnica Nacional de Colombia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Corporacion Politecnica Nacional de Colombia</mdui:Description>
+        <mdui:Description xml:lang="es">CorporaciÃ³n PolitÃ©cnica Nacional de Colombia</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>
+MIIDRDCCAiygAwIBAgIVALLT+WTdNsEz6xx5u57WIcx8JElFMA0GCSqGSIb3DQEB
+CwUAMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmljYS5lZHUuY28wHhcNMTYwMjI1
+MTQ0NzI4WhcNMzYwMjI1MTQ0NzI4WjAhMR8wHQYDVQQDDBZpZHAucG9saXRlY25p
+Y2EuZWR1LmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjKyNQzEY
+IDz7LLU7JhEYAguZiscGEX3B79BN5iaaEEd7NhzyYL5e4H4sFnJZ0i3lvFxGlDZj
+XtT7xEv8eS6SSbjZJ9FOmmbOMHfpGMIaYjXHx6MzkLN/jfVv/Q18JXCnQzmaY8XS
+YzQXxl5bGtBcsnv6g0TmJZpxS5y/jNIQvcZRujekkbskjyMkqlLo7fA41BjwGjgr
+Ri44+/QUaGgAQzLsjyPJzC+MDfcCQWG1L9Jdw8853qboTkn5SHJqrZD1OeOTYirw
+WsQRj249Y33p7+kLBrMD+54KrPk63mLPF2lYjh2KzfBR1qbuiNjAEXXKfYAl47dz
+I/KNCNpiLVbYXwIDAQABo3MwcTAdBgNVHQ4EFgQUM43hzLJFdMk8Sxshi8WWy7ME
+JaIwUAYDVR0RBEkwR4IWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jb4YtaHR0cHM6Ly9p
+ZHAucG9saXRlY25pY2EuZWR1LmNvL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQBOazTBGiBWAlaDmIhRxZgTmYDQeqvia95RR59uW8bhg1HSxQruz45d
+ZF4XWEhJ6utKGo6QCJSXf/MsAaPUKCYT6OBvIbTArTeUeKzyOEAnH3IL3uO4F3d6
+GyQc7EOSaAWywtPe1fiCM02I//FNl1K+VIJdfO7lFGLNx8XZ4TAmxWmlCc3uaI23
+v/2bRIY12legoOZGMBD+U05hMvPozP3dawqRXKmMpIT94t7QoRUT9sLfCE1E/Obn
+s0fmhhFblLDWEWCf46oIfgd4zGZqcmLHAKeUmnCA2tMrSD7+fmXVDz6yt3ySpKCK
+TdJDiBfKuVh3IECFWZ6+L9/CVJv5Sqm7
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDQzCCAiugAwIBAgIUNo4WuHVgmvnokxrB1OeB+1nrgn8wDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jbzAeFw0xNjAyMjUx
+NDQ3MjRaFw0zNjAyMjUxNDQ3MjRaMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmlj
+YS5lZHUuY28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCliUrMbHvs
+kl3COdt7P0UgoEQ5smBH9YetLsvzGo+tbLJ7SRqkITlRWQXaJFqePJ+APRo8tRIR
+mL99gl2OuOc6etN82KVB8idyE2rC/uEQnqfVZO0WPAibICEm2zjoaMMdSTgev4gI
+LqeZ2HCG50DjFhcWNglsTABhvHDk8XE/QPpqoFALepozKykcTVidHzyDQeH4+syJ
+IiwsW+mH83LnbQ1vIuqqGYwZ9+9BDy0pA3D9KWePfkcTpoVJLEMYHurgTEYSqivB
+476LFkaTd7DhlLi+ddb09OPeyqsumq/C0kGMY1GTJckk0C7hOayGwiWoZkyTUSHF
+ZllwhARpj8pHAgMBAAGjczBxMB0GA1UdDgQWBBRY/2odAVt3NTy+R/k2pou6SW/r
+2DBQBgNVHREESTBHghZpZHAucG9saXRlY25pY2EuZWR1LmNvhi1odHRwczovL2lk
+cC5wb2xpdGVjbmljYS5lZHUuY28vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAGbF/LoU7ZuCZoNjUyxKdfxjkJkgZ75PiQlqQ21+L5RbYbsTiMzuJtaV
+qyNJPJvT0MsXRwnKntiSChZ6nVtdLQXcXf2xWCiJHdcb0uzhGTFr3aIiPOTY9TiJ
+aw1foI6WxTVPtolIj+BmeKi+1Vy+ITyJZYXqC3ZnSNGv5jxGLyyjI9WnwJ5Zonl5
+MG63FxrmNlorkaHh8K6TOWcdIw2IeqBr15f7oExN6pgijgyJ/9oeVk01K9d55NLI
+lfQnX3dTZbzhAPoGnAlCIUcJjeH+ESDAR57hVC8u8+kMjdKorq4Ohvpqc+XjAYRl
+e29cUKcPujSEW+pJdMWH+2sPqW2M3wU=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDQzCCAiugAwIBAgIUMgiMuAX0pbhavZ4i1yl7uO2HpAEwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jbzAeFw0xNjAyMjUx
+NDQ3MjZaFw0zNjAyMjUxNDQ3MjZaMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmlj
+YS5lZHUuY28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjhzloyYYi
+oKmFqjuyzjiU0FdkR9kZx5t4kHbjnwbLfSr+umiRQOQuz1oVkJwXIkjKobMXUY5F
+SnPQlzUZyw2KxMmH4Pg+4KfEhYj0biRG/bmWkvoTqJdrYq9273j7uFT18i5SEWzX
+jmG8imWFkmvK2Y6VrOEYuIRiDil27TPxvEZJ6dSHv2Q/FOIzfYD582bBmeWGcOmY
+JpMuqzi5FW1vs96QIabJ9QKJ8VTvVv6TXaj75FvvWbDbtOUWghP9IKFVSa6mPB9V
+z9lHdCOPAfzsbm82hG67Q5ipEmbIfBt5bHIRrTViWwC3cYUuJudQ4Zb6Cz40hO9u
+lCIIAvDQeDCtAgMBAAGjczBxMB0GA1UdDgQWBBSZST+CVKY+u0y9KuR6jRFg1MKk
+hDBQBgNVHREESTBHghZpZHAucG9saXRlY25pY2EuZWR1LmNvhi1odHRwczovL2lk
+cC5wb2xpdGVjbmljYS5lZHUuY28vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAFJXD1U/w5DldguWWlpIgaGX33gpB8lmZ5DmwCAV9TCo5MtkzRd3psZf
+SW/FXvDqARzIPFiHgIr5uUagWQDTmTr9+AmRgMl12sHC6jL391TMw9k2B+ofA6pY
+iWCooMb2Ua8sHfETlb1i7/oHMoKfAI+vOHN30B/3zhGuevobaLmjKPBSvfCvYRJq
+nq5OpQh1pJdNwnfOFsxD5hFctOan+Q8PQCiMhm7z2epJAoIVwpxQVYzLhhQVq7NJ
+DKxk60nmPyjgvFYuXNh9JEv0Cwe8rVzuBxssCDuJYtIKNRynILzaYFP5a3lp0/tC
+hnIvrkPFl+JtdYNgaSsOrzFBzAGRH4I=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.politecnica.edu.co:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.politecnica.edu.co:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.politecnica.edu.co:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.politecnica.edu.co/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">politecnica.edu.co</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDRDCCAiygAwIBAgIVALLT+WTdNsEz6xx5u57WIcx8JElFMA0GCSqGSIb3DQEB
+CwUAMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmljYS5lZHUuY28wHhcNMTYwMjI1
+MTQ0NzI4WhcNMzYwMjI1MTQ0NzI4WjAhMR8wHQYDVQQDDBZpZHAucG9saXRlY25p
+Y2EuZWR1LmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjKyNQzEY
+IDz7LLU7JhEYAguZiscGEX3B79BN5iaaEEd7NhzyYL5e4H4sFnJZ0i3lvFxGlDZj
+XtT7xEv8eS6SSbjZJ9FOmmbOMHfpGMIaYjXHx6MzkLN/jfVv/Q18JXCnQzmaY8XS
+YzQXxl5bGtBcsnv6g0TmJZpxS5y/jNIQvcZRujekkbskjyMkqlLo7fA41BjwGjgr
+Ri44+/QUaGgAQzLsjyPJzC+MDfcCQWG1L9Jdw8853qboTkn5SHJqrZD1OeOTYirw
+WsQRj249Y33p7+kLBrMD+54KrPk63mLPF2lYjh2KzfBR1qbuiNjAEXXKfYAl47dz
+I/KNCNpiLVbYXwIDAQABo3MwcTAdBgNVHQ4EFgQUM43hzLJFdMk8Sxshi8WWy7ME
+JaIwUAYDVR0RBEkwR4IWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jb4YtaHR0cHM6Ly9p
+ZHAucG9saXRlY25pY2EuZWR1LmNvL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQBOazTBGiBWAlaDmIhRxZgTmYDQeqvia95RR59uW8bhg1HSxQruz45d
+ZF4XWEhJ6utKGo6QCJSXf/MsAaPUKCYT6OBvIbTArTeUeKzyOEAnH3IL3uO4F3d6
+GyQc7EOSaAWywtPe1fiCM02I//FNl1K+VIJdfO7lFGLNx8XZ4TAmxWmlCc3uaI23
+v/2bRIY12legoOZGMBD+U05hMvPozP3dawqRXKmMpIT94t7QoRUT9sLfCE1E/Obn
+s0fmhhFblLDWEWCf46oIfgd4zGZqcmLHAKeUmnCA2tMrSD7+fmXVDz6yt3ySpKCK
+TdJDiBfKuVh3IECFWZ6+L9/CVJv5Sqm7
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDQzCCAiugAwIBAgIUNo4WuHVgmvnokxrB1OeB+1nrgn8wDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jbzAeFw0xNjAyMjUx
+NDQ3MjRaFw0zNjAyMjUxNDQ3MjRaMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmlj
+YS5lZHUuY28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCliUrMbHvs
+kl3COdt7P0UgoEQ5smBH9YetLsvzGo+tbLJ7SRqkITlRWQXaJFqePJ+APRo8tRIR
+mL99gl2OuOc6etN82KVB8idyE2rC/uEQnqfVZO0WPAibICEm2zjoaMMdSTgev4gI
+LqeZ2HCG50DjFhcWNglsTABhvHDk8XE/QPpqoFALepozKykcTVidHzyDQeH4+syJ
+IiwsW+mH83LnbQ1vIuqqGYwZ9+9BDy0pA3D9KWePfkcTpoVJLEMYHurgTEYSqivB
+476LFkaTd7DhlLi+ddb09OPeyqsumq/C0kGMY1GTJckk0C7hOayGwiWoZkyTUSHF
+ZllwhARpj8pHAgMBAAGjczBxMB0GA1UdDgQWBBRY/2odAVt3NTy+R/k2pou6SW/r
+2DBQBgNVHREESTBHghZpZHAucG9saXRlY25pY2EuZWR1LmNvhi1odHRwczovL2lk
+cC5wb2xpdGVjbmljYS5lZHUuY28vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAGbF/LoU7ZuCZoNjUyxKdfxjkJkgZ75PiQlqQ21+L5RbYbsTiMzuJtaV
+qyNJPJvT0MsXRwnKntiSChZ6nVtdLQXcXf2xWCiJHdcb0uzhGTFr3aIiPOTY9TiJ
+aw1foI6WxTVPtolIj+BmeKi+1Vy+ITyJZYXqC3ZnSNGv5jxGLyyjI9WnwJ5Zonl5
+MG63FxrmNlorkaHh8K6TOWcdIw2IeqBr15f7oExN6pgijgyJ/9oeVk01K9d55NLI
+lfQnX3dTZbzhAPoGnAlCIUcJjeH+ESDAR57hVC8u8+kMjdKorq4Ohvpqc+XjAYRl
+e29cUKcPujSEW+pJdMWH+2sPqW2M3wU=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDQzCCAiugAwIBAgIUMgiMuAX0pbhavZ4i1yl7uO2HpAEwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jbzAeFw0xNjAyMjUx
+NDQ3MjZaFw0zNjAyMjUxNDQ3MjZaMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmlj
+YS5lZHUuY28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjhzloyYYi
+oKmFqjuyzjiU0FdkR9kZx5t4kHbjnwbLfSr+umiRQOQuz1oVkJwXIkjKobMXUY5F
+SnPQlzUZyw2KxMmH4Pg+4KfEhYj0biRG/bmWkvoTqJdrYq9273j7uFT18i5SEWzX
+jmG8imWFkmvK2Y6VrOEYuIRiDil27TPxvEZJ6dSHv2Q/FOIzfYD582bBmeWGcOmY
+JpMuqzi5FW1vs96QIabJ9QKJ8VTvVv6TXaj75FvvWbDbtOUWghP9IKFVSa6mPB9V
+z9lHdCOPAfzsbm82hG67Q5ipEmbIfBt5bHIRrTViWwC3cYUuJudQ4Zb6Cz40hO9u
+lCIIAvDQeDCtAgMBAAGjczBxMB0GA1UdDgQWBBSZST+CVKY+u0y9KuR6jRFg1MKk
+hDBQBgNVHREESTBHghZpZHAucG9saXRlY25pY2EuZWR1LmNvhi1odHRwczovL2lk
+cC5wb2xpdGVjbmljYS5lZHUuY28vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAFJXD1U/w5DldguWWlpIgaGX33gpB8lmZ5DmwCAV9TCo5MtkzRd3psZf
+SW/FXvDqARzIPFiHgIr5uUagWQDTmTr9+AmRgMl12sHC6jL391TMw9k2B+ofA6pY
+iWCooMb2Ua8sHfETlb1i7/oHMoKfAI+vOHN30B/3zhGuevobaLmjKPBSvfCvYRJq
+nq5OpQh1pJdNwnfOFsxD5hFctOan+Q8PQCiMhm7z2epJAoIVwpxQVYzLhhQVq7NJ
+DKxk60nmPyjgvFYuXNh9JEv0Cwe8rVzuBxssCDuJYtIKNRynILzaYFP5a3lp0/tC
+hnIvrkPFl+JtdYNgaSsOrzFBzAGRH4I=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.politecnica.edu.co:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="es">POLITECNICA - CorporaciÃ³n PolitÃ©cnica Nacional de Colombia</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">POLITECNICA - CorporaciÃ³n PolitÃ©cnica Nacional de Colombia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="es">POLITECNICA - CorporaciÃ³n PolitÃ©cnica Nacional de Colombia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">POLITECNICA - Corporacion Politecnica Nacional de Colombia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="es">http://www.politecnica.edu.co</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.politecnica.edu.co</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Hernan Hidalgo Vallejo</md:SurName>
+    <md:EmailAddress>hhidalgo@politecnica.edu.co</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Hernan Hidalgo Vallejo</md:SurName>
+    <md:EmailAddress>hhidalgo@politecnica.edu.co</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
index db02d03f..c5c594d1 100644
--- a/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
@@ -44,6 +44,32 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDMzCCAhugAwIBAgIUbnfzbJZ/O+fV1NexL4aBnpXq2EwwDQYJKoZIhvcNAQEF
+						BQAwHTEbMBkGA1UEAwwSaWRwLnJpY2h1aXNoLmFjLnVrMB4XDTE2MDQwODEzMTA1
+						NloXDTM2MDQwODEzMTA1NlowHTEbMBkGA1UEAwwSaWRwLnJpY2h1aXNoLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs3FzkF00xjUKGi7Fdh32
+						ZB2ijup6n53CeVQF5fxDuuesM+LgSLKu29/mM3/cbtOVxWmcyK+MVWIEMubbqNfa
+						6lhmHCSgpJe3H9LkpvKW1oH+4ABZ2dXw4ngzwaK2apTQaAaTyIF6nxDNqbwVhvut
+						ELaou4dHslzvHSmk/sEvqSjWBWnfZFYe1nC7ssNIJj3i5HBK9S5JWpHX5LW7916x
+						4hPaqWZQp849Zav98Wd9z4fh37AuROjDSzxkJSyTd5ohAypFaAyzwzHd4pF1/yyA
+						IJkW60VRf2SM8+4+emTwuXRamJkn4sDDNo292u7rXQKfPXUdP0Okt979bnIuhjIx
+						mwIDAQABo2swaTAdBgNVHQ4EFgQUuthtEWH554XjUaTMZx8diEY+i/4wSAYDVR0R
+						BEEwP4ISaWRwLnJpY2h1aXNoLmFjLnVrhilodHRwczovL2lkcC5yaWNodWlzaC5h
+						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAfO9POrniizxA
+						3V4bb14SNEIuoKLkG4yzHXOlYP1rExHcdZXkzNXG83C50sNglLR7TadbZlk441b+
+						rKjys6rravpMIb4VnerHNHMcG8B7q/DY7BZQ1TzCI1/yqH9pJCo3ywj79/teJ+qt
+						mWBp0cRq9tkOSrAKNJG4m00JZTyk9lUssAPfsNqzPzWy4jDW+DbhoORAx7Xazsyb
+						R51QO8W37mcTYc3m9+CT9q9Dsmsi/gBdsn9UNzKGN+5++ly7Iu/rECW0htfAu3D3
+						Z1CAsGL1edbXdxYGrBIwg2Vx5utHfnLcjqWCgcK3dc/o+jUiNcEj7fXi51xY/50J
+						RHU9aHXUNA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
     <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"/>
     <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"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -89,6 +115,32 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDMzCCAhugAwIBAgIUbnfzbJZ/O+fV1NexL4aBnpXq2EwwDQYJKoZIhvcNAQEF
+						BQAwHTEbMBkGA1UEAwwSaWRwLnJpY2h1aXNoLmFjLnVrMB4XDTE2MDQwODEzMTA1
+						NloXDTM2MDQwODEzMTA1NlowHTEbMBkGA1UEAwwSaWRwLnJpY2h1aXNoLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs3FzkF00xjUKGi7Fdh32
+						ZB2ijup6n53CeVQF5fxDuuesM+LgSLKu29/mM3/cbtOVxWmcyK+MVWIEMubbqNfa
+						6lhmHCSgpJe3H9LkpvKW1oH+4ABZ2dXw4ngzwaK2apTQaAaTyIF6nxDNqbwVhvut
+						ELaou4dHslzvHSmk/sEvqSjWBWnfZFYe1nC7ssNIJj3i5HBK9S5JWpHX5LW7916x
+						4hPaqWZQp849Zav98Wd9z4fh37AuROjDSzxkJSyTd5ohAypFaAyzwzHd4pF1/yyA
+						IJkW60VRf2SM8+4+emTwuXRamJkn4sDDNo292u7rXQKfPXUdP0Okt979bnIuhjIx
+						mwIDAQABo2swaTAdBgNVHQ4EFgQUuthtEWH554XjUaTMZx8diEY+i/4wSAYDVR0R
+						BEEwP4ISaWRwLnJpY2h1aXNoLmFjLnVrhilodHRwczovL2lkcC5yaWNodWlzaC5h
+						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAfO9POrniizxA
+						3V4bb14SNEIuoKLkG4yzHXOlYP1rExHcdZXkzNXG83C50sNglLR7TadbZlk441b+
+						rKjys6rravpMIb4VnerHNHMcG8B7q/DY7BZQ1TzCI1/yqH9pJCo3ywj79/teJ+qt
+						mWBp0cRq9tkOSrAKNJG4m00JZTyk9lUssAPfsNqzPzWy4jDW+DbhoORAx7Xazsyb
+						R51QO8W37mcTYc3m9+CT9q9Dsmsi/gBdsn9UNzKGN+5++ly7Iu/rECW0htfAu3D3
+						Z1CAsGL1edbXdxYGrBIwg2Vx5utHfnLcjqWCgcK3dc/o+jUiNcEj7fXi51xY/50J
+						RHU9aHXUNA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml
index ac6f9c4d..cd786d28 100644
--- a/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml
@@ -20,8 +20,8 @@
         <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:Logo xml:lang="sv" height="90" width="165">http://www.rkh.se/images/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="90" width="165">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>
diff --git a/swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml
index 56677a4b..135e542d 100644
--- a/swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml
@@ -11,7 +11,7 @@
         <mdui:DisplayName xml:lang="en">National Scientific Library - Georgia</mdui:DisplayName>
         <mdui:Description xml:lang="en">National Scientific Library - Georgia</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://sciencelib.ge</mdui:InformationURL>
-        <mdui:Logo height="23" width="24" xml:lang="en">http://www.sciencelib.ge/themes/pushbutton/icon-block.png</mdui:Logo>
+        <mdui:Logo width="24" height="23" xml:lang="en">http://www.sciencelib.ge/themes/pushbutton/icon-block.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:IPHint>217.147.239.76/32</mdui:IPHint>
diff --git a/swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml b/swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml
deleted file mode 100644
index bb8d7115..00000000
--- a/swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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.shibboleth.stir.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml
index abb9a8b1..0a6ab487 100644
--- a/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml
@@ -36,44 +36,6 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <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>
-    </KeyDescriptor>
     <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"/>
     <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"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -113,44 +75,6 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <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>
-    </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml
deleted file mode 100644
index eb1290e2..00000000
--- a/swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-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.smith.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.smith.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smith.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Smith College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Smith College Shibboleth users</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.smith.edu/its/about_its/cis_program.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="88" width="504" xml:lang="en">https://idp.smith.edu/idp/images/logolargest.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAOXTUWYc/vuvnb2nW8QaBdLG+Y+1MA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5zbWl0aC5lZHUwHhcNMTEwMzE3MjA1NzE5WhcN
-MzEwMzE3MjA1NzE5WjAYMRYwFAYDVQQDEw1pZHAuc21pdGguZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAibMyR65Zf/rn5rDxxIzv1Gt5CayKblSG
-a0n/ti8IFG8kwByWr+iXnf5YRUFaSNPsY78PxtfFSvy9Nz58nx4CPC8tGiuDxwKC
-lUo792rKnEB/XxZU3YdpZotGGYi02S5V2eJ1js3lzPFCKZojtJqzU2BhXD55ptE2
-1eAnpqDOpsetLOTYRRKIPF/GMx2W23VyVLM8OjTLQOtK///3o6xjemUa1a7tsjFb
-SaMXo1CaAhO1SMOwFEODamdUMsZYwkbuRTMZw7lB0z+jcxeOlJ+geGYc1RG06VNT
-wW0Yu5k7FqbDvWaRZHpaNfGh42BDJGbAk5/OllWMzHhSTDatai92nwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuc21pdGguZWR1hiRodHRwczovL2lkcC5zbWl0aC5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNc1trjeTE3ROprI6Gu7Pw8cjSaX
-MA0GCSqGSIb3DQEBBQUAA4IBAQA65xzv6pbVuyNB7DknRnLDC62C9RSde+suUO2H
-C3CNlxV81yyM7/RNl/Liq7MwiOHYQN34kTm4O9+tR6tgjM+v6FabJDofEQtx6SeX
-08RSFBAQrx8JZwUP2nBAaanGR+JfXG7L9fn79IjvgCmOQzSowaaYhNQs0yzav4dX
-QPjTTIMWFDJstNfSebNGuqEwep3n0edtntxVmEsmpBL91CvldRpur+98khDuVOFR
-vQtYab9MmbvB63JGIVkxNVE8yIk9QGCSCSPVQ7fMWld8BF4u80GlkQhKRkcJG8wE
-W/ZThBpy7D55O139vCdRdOYStyJZaLKjPue6nhVkPePVOuQg
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.smith.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.smith.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.smith.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.smith.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.smith.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smith.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAOXTUWYc/vuvnb2nW8QaBdLG+Y+1MA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5zbWl0aC5lZHUwHhcNMTEwMzE3MjA1NzE5WhcN
-MzEwMzE3MjA1NzE5WjAYMRYwFAYDVQQDEw1pZHAuc21pdGguZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAibMyR65Zf/rn5rDxxIzv1Gt5CayKblSG
-a0n/ti8IFG8kwByWr+iXnf5YRUFaSNPsY78PxtfFSvy9Nz58nx4CPC8tGiuDxwKC
-lUo792rKnEB/XxZU3YdpZotGGYi02S5V2eJ1js3lzPFCKZojtJqzU2BhXD55ptE2
-1eAnpqDOpsetLOTYRRKIPF/GMx2W23VyVLM8OjTLQOtK///3o6xjemUa1a7tsjFb
-SaMXo1CaAhO1SMOwFEODamdUMsZYwkbuRTMZw7lB0z+jcxeOlJ+geGYc1RG06VNT
-wW0Yu5k7FqbDvWaRZHpaNfGh42BDJGbAk5/OllWMzHhSTDatai92nwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuc21pdGguZWR1hiRodHRwczovL2lkcC5zbWl0aC5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNc1trjeTE3ROprI6Gu7Pw8cjSaX
-MA0GCSqGSIb3DQEBBQUAA4IBAQA65xzv6pbVuyNB7DknRnLDC62C9RSde+suUO2H
-C3CNlxV81yyM7/RNl/Liq7MwiOHYQN34kTm4O9+tR6tgjM+v6FabJDofEQtx6SeX
-08RSFBAQrx8JZwUP2nBAaanGR+JfXG7L9fn79IjvgCmOQzSowaaYhNQs0yzav4dX
-QPjTTIMWFDJstNfSebNGuqEwep3n0edtntxVmEsmpBL91CvldRpur+98khDuVOFR
-vQtYab9MmbvB63JGIVkxNVE8yIk9QGCSCSPVQ7fMWld8BF4u80GlkQhKRkcJG8wE
-W/ZThBpy7D55O139vCdRdOYStyJZaLKjPue6nhVkPePVOuQg
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.smith.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Smith College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Smith College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.smith.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Karla Borecky</md:GivenName>
-    <md:EmailAddress>kborecky@smith.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>John Crowley</md:GivenName>
-    <md:EmailAddress>jcrowley@smith.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Eric Brewer</md:GivenName>
-    <md:EmailAddress>ebrewer@smith.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml
index 99bcf5eb..57e7650f 100644
--- a/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml
@@ -14,6 +14,38 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+						MIIEXDCCA0SgAwIBAgIJAKyPn9Ts3+81MA0GCSqGSIb3DQEBCwUAMIGzMQswCQYD
+						VQQGEwJHQjEOMAwGA1UECAwFRGV2b24xETAPBgNVBAcMCFBhaWdudG9uMRwwGgYD
+						VQQKDBNTb3V0aCBEZXZvbiBDb2xsZWdlMRowGAYDVQQLDBFDb21wdXRlciBTZXJ2
+						aWNlczEdMBsGA1UEAwwUaWRwLnNvdXRoZGV2b24uYWMudWsxKDAmBgkqhkiG9w0B
+						CQEWGWhlbHBkZXNrQHNvdXRoZGV2b24uYWMudWswHhcNMTYwNDEyMTI1MjExWhcN
+						MjYwNDEwMTI1MjExWjCBszELMAkGA1UEBhMCR0IxDjAMBgNVBAgMBURldm9uMREw
+						DwYDVQQHDAhQYWlnbnRvbjEcMBoGA1UECgwTU291dGggRGV2b24gQ29sbGVnZTEa
+						MBgGA1UECwwRQ29tcHV0ZXIgU2VydmljZXMxHTAbBgNVBAMMFGlkcC5zb3V0aGRl
+						dm9uLmFjLnVrMSgwJgYJKoZIhvcNAQkBFhloZWxwZGVza0Bzb3V0aGRldm9uLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw780rAsk+mJLxAxM
+						4AJfvZBzfb4l9Vpu/6BO8Or54rmp/uThhC0mgdoJqQlmaEb4ZIK4/CbfstV8Qo3s
+						INiy6Z1+xMVcrBalH9gG6cXB7i1E1vDuUE5gg/qd1KGCwXrVBDKGKF1enpMlOBgQ
+						cTHZ2dpTf9Hgjmxcixa030ETpvmDyja86dYnQnkxGpXbIyxJR9h7XlkGXzd/fdP0
+						dk45mXkzna05QThcg6SqMlZasi4iyd8UGulWAg7sYBIfxI3Xm88PaTm+KscBCVPu
+						Ma1WatglA9JIBlQwWantChP7AI9v4YZGG+af6uhp1l8UzXA8EdQL6lCwqvmgGD0F
+						1RFX0wIDAQABo3EwbzAfBgNVHREEGDAWghRpZHAuc291dGhkZXZvbi5hYy51azAd
+						BgNVHQ4EFgQUivSrY0v+NvStP9sX9z4xYKNpba0wHwYDVR0jBBgwFoAUivSrY0v+
+						NvStP9sX9z4xYKNpba0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA
+						RO80zk8JjZ7UpVODbHxiyAzs1WX4wIoUc8VR6Cpf55/tTUEBhfU1sHggV5J285Xk
+						ngRf3d+5xcnqO+RjMPn7AXU35ycRofFWsDNtabcWoXK4X6pYrYUAQEsZu/4Q05qJ
+						jzxP0lDW16HRN+JJs97Lel95y8tvhyGhc6VTLzwvOMBCTHeWhuPmlzAZmh3w3hLz
+						f5rIu2knlPysAdyln9PGl1tRSchcjJhN2K/Bq2xVSCFWmGjZiENHc2yfpwc+z7Xq
+						As5id/Pz62Gwe5qtzQSiWo9G1zkAw2PODKY0rA4JNAvwT9whv2A/Ef8ggRmiJGu6
+						9Ia6HkphVIymnefQl1ZO/Q==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE5DCCA8ygAwIBAgIRANGrqwrzcv/wwtm5h/u2MFkwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA1MTYwMDAwMDBaFw0xNjA1MTUyMzU5NTlaMIGvMQswCQYD
@@ -62,6 +94,38 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+						MIIEXDCCA0SgAwIBAgIJAKyPn9Ts3+81MA0GCSqGSIb3DQEBCwUAMIGzMQswCQYD
+						VQQGEwJHQjEOMAwGA1UECAwFRGV2b24xETAPBgNVBAcMCFBhaWdudG9uMRwwGgYD
+						VQQKDBNTb3V0aCBEZXZvbiBDb2xsZWdlMRowGAYDVQQLDBFDb21wdXRlciBTZXJ2
+						aWNlczEdMBsGA1UEAwwUaWRwLnNvdXRoZGV2b24uYWMudWsxKDAmBgkqhkiG9w0B
+						CQEWGWhlbHBkZXNrQHNvdXRoZGV2b24uYWMudWswHhcNMTYwNDEyMTI1MjExWhcN
+						MjYwNDEwMTI1MjExWjCBszELMAkGA1UEBhMCR0IxDjAMBgNVBAgMBURldm9uMREw
+						DwYDVQQHDAhQYWlnbnRvbjEcMBoGA1UECgwTU291dGggRGV2b24gQ29sbGVnZTEa
+						MBgGA1UECwwRQ29tcHV0ZXIgU2VydmljZXMxHTAbBgNVBAMMFGlkcC5zb3V0aGRl
+						dm9uLmFjLnVrMSgwJgYJKoZIhvcNAQkBFhloZWxwZGVza0Bzb3V0aGRldm9uLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw780rAsk+mJLxAxM
+						4AJfvZBzfb4l9Vpu/6BO8Or54rmp/uThhC0mgdoJqQlmaEb4ZIK4/CbfstV8Qo3s
+						INiy6Z1+xMVcrBalH9gG6cXB7i1E1vDuUE5gg/qd1KGCwXrVBDKGKF1enpMlOBgQ
+						cTHZ2dpTf9Hgjmxcixa030ETpvmDyja86dYnQnkxGpXbIyxJR9h7XlkGXzd/fdP0
+						dk45mXkzna05QThcg6SqMlZasi4iyd8UGulWAg7sYBIfxI3Xm88PaTm+KscBCVPu
+						Ma1WatglA9JIBlQwWantChP7AI9v4YZGG+af6uhp1l8UzXA8EdQL6lCwqvmgGD0F
+						1RFX0wIDAQABo3EwbzAfBgNVHREEGDAWghRpZHAuc291dGhkZXZvbi5hYy51azAd
+						BgNVHQ4EFgQUivSrY0v+NvStP9sX9z4xYKNpba0wHwYDVR0jBBgwFoAUivSrY0v+
+						NvStP9sX9z4xYKNpba0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA
+						RO80zk8JjZ7UpVODbHxiyAzs1WX4wIoUc8VR6Cpf55/tTUEBhfU1sHggV5J285Xk
+						ngRf3d+5xcnqO+RjMPn7AXU35ycRofFWsDNtabcWoXK4X6pYrYUAQEsZu/4Q05qJ
+						jzxP0lDW16HRN+JJs97Lel95y8tvhyGhc6VTLzwvOMBCTHeWhuPmlzAZmh3w3hLz
+						f5rIu2knlPysAdyln9PGl1tRSchcjJhN2K/Bq2xVSCFWmGjZiENHc2yfpwc+z7Xq
+						As5id/Pz62Gwe5qtzQSiWo9G1zkAw2PODKY0rA4JNAvwT9whv2A/Ef8ggRmiJGu6
+						9Ia6HkphVIymnefQl1ZO/Q==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE5DCCA8ygAwIBAgIRANGrqwrzcv/wwtm5h/u2MFkwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA1MTYwMDAwMDBaFw0xNjA1MTUyMzU5NTlaMIGvMQswCQYD
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
index b39a35af..d86e3b79 100644
--- a/swamid-interfederations-2.0/idp.suni.se-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/idp.suni.se-adfs-services-trust.xml
@@ -32,35 +32,35 @@
     <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="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"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="cn" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/cn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <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" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/cn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonEntitlement" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Display Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/initials" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Initials"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/norEduPersonNIN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonNIN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/socialSecurityNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="socialSecurityNumber"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/socialSecurityNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="socialSecurityNumberNotOld"/>
   </md:IDPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="sv-SE">Södertörns högskola</md:OrganizationName>
diff --git a/swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml
index 55298267..cf470794 100644
--- a/swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml
@@ -42,8 +42,6 @@
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/simplesaml/saml2/idp/SingleLogoutService.php"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/simplesaml/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.szie.hu/idp/profile/SAML2/POST/SSO"/>
   </md:IDPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="hu">Szent István Egyetem</md:OrganizationName>
diff --git a/swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml
index 753bb71b..4c565f6c 100644
--- a/swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml
@@ -14,7 +14,7 @@
         <mdui:DisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Ανατολικής Μακεδονίας και Θράκης</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">http://www.teiemt.gr/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="el">http://www.teiemt.gr/</mdui:InformationURL>
-        <mdui:Logo height="83" width="83">https://idp.teikav.edu.gr/logo.png</mdui:Logo>
+        <mdui:Logo width="83" height="83">https://idp.teikav.edu.gr/logo.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:IPHint>195.130.92.0/23</mdui:IPHint>
diff --git a/swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml
index 233fbe9f..13ee7cf7 100644
--- a/swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml
@@ -14,7 +14,7 @@
         <mdui:DisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Στερεάς Ελλάδας</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">http://www.teiste.gr/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="el">http://www.teiste.gr/</mdui:InformationURL>
-        <mdui:Logo height="81" width="83">https://idp.teilam.gr/logo.png</mdui:Logo>
+        <mdui:Logo width="83" height="81">https://idp.teilam.gr/logo.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:IPHint>195.130.78.0/23</mdui:IPHint>
diff --git a/swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml
index d1310796..ce1910fc 100644
--- a/swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml
@@ -7,8 +7,8 @@
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-paristech.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Télécom ParisTech</mdui:DisplayName>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAClUlEQVQoz4XLXU9SYRwA8P/zclBAQJ04DUMXIlijCdnWXZlZF3Zh6ypqtfVyWZfd1mprq5u+Qptld7VydVWtGjNz6UxJRbQxjxxOAqLAgXM4z3mePoK/+x/aSG/M/ZyjlMJBmMVisRhNJpPxa3EXuA8MFShPvZqihFI7ODv9nQcG2AJKKAWAOmh6TQcEhBKEEMbY0A0qSZZlEYLNhkkpJYRUoAwAlFvW9as3PB63YRjFQlHTaoqiTFyeWF9L9fb1ybIcOR5Jp9ZzOTU6PMQ5pwDAOaeSNBAKffn0+cRwrPK1Eg6HmyTb6uqa3+9f+LVw687NYnHXbm9mjJH4lfiH6Y+GYXR3dwmAXr+/2d7c3t6eyymhcNg0zWgsmslkJl9M6oY+EBqgCOPEbMLn9RXyhUB///t30/md/PLv5UbD7PDKwWAw8T2hqurYhbFsNgsAFADs4JAkye1xb8tyoD/g6+kpl/cD/YG90h5GaGR0RKtWS6W90XOj3OJUCF4HjTG2mlw1TTO7nWWMMWYtLS5xi2OCKaWcc0mSqpXqs+dPaYvLNTZ+0elwCM65YSIbRRgD54hSbjJEMMLY0g3AuF6vu9takZFRtfkUooS0OFxno7WZFXO/InW1acm/rkiw8W+3Jitdl0YbalFwwQQjd8+My49f1lOKvpHTt1T54WtTqwlLrN9+YOv1F6a+7b6dzT56U1OU9L0nzacGsQCur+X2fyxVl9KkvaWxWSjP/3Ec7SPQ0uTroD1tredjtkiH8+QABiciBHOTNeoZs7RjKVXnsSOd98ebOrzaWgaBTXBh5PLCEp7TQ56RIQGGYAxpm/L+wgoimNod9t5DdVklmNoOe6vJTU90UMsqQmtgm+Qc7CvNLLoiwf/9YlMHLNeSiwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo0MiswMjowMMft3eUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NDIrMDI6MDC2sGVZAAAAAElFTkSuQmCC</mdui:Logo>
@@ -50,8 +50,8 @@ DmlnOFBrEU8tBkHNwNS0wwdZkOuQjoafB1QOZ39oH7koG+DICom7vxCLTWxcAMj+
   </md:IDPSSODescriptor>
   <md: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-paristech.fr</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..698cf182
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.udu.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.udu.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-04-08T11:34:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udu.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Art History of the Academy of Sciences of the Czech Republic</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav dějin umění Akademie věd ČR, v.v.i</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider IAH AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚDU AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.udu.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.udu.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="121">https://jiftach.cas.cz/loga/logo-udu-44.png</mdui:Logo>
+        <mdui:Logo height="476" width="1309">https://jiftach.cas.cz/loga/logo-udu-476.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUDdgXhHF/fFmY4C/uE1WS2GHgpZYwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLnVkdS5jYXMuY3owHhcNMTYwMzE4MDg0OTMzWhcN
+MzYwMzE4MDg0OTMzWjAZMRcwFQYDVQQDEw5pZHAudWR1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjgDKLkK7EFE1F7ykATltO3yuw23qm6
+sgNMSENfnP2qImMzDf4nmKLScVkyyzWPsmoTVMcB+WYiYG6gT+bxEMmyQfOruFrq
+mejArIup36YBrC14etLe7UemOe7IIWprPQilDNlzp0Gaehj23PNQvBwfHV9jMbLe
+iRn5YYHNd3fmn9G9qRFfnBpxjbaIH0TC67CO+qX+1Pq71LmTkA7TCH1MYRflCIv0
+E/oXVjTGvt0LFiqtRrOaYVEX/N75z6/8T3CPZdJRF1mHZoxe2x3F4fUCs6fjhrDy
+DF/VGiK3P1+oq/YKSO9xWfFfBfUe6qIjA4hX70cpyWHXVjku/03M69ECAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLnVkdS5jYXMuY3qGJWh0dHBzOi8vaWRwLnVkdS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJBCKe7lHF0NXla0FKN6rEVR
+42qDMA0GCSqGSIb3DQEBBQUAA4IBAQB0gFLUDJN/iJXYI5r9cV4/ptJUosnsB283
+JChXltB/yGffjAHQW5dUqu6JqT6xZWkqP5ECzGE3Php68Ww6xf9uZg3LpHCfV/NP
+TI9m+1u6JzuE8FxY+7pipTnqJUfdbYMVRGxWA7okyEsgxBNdQTu76AR8IA7sQ/2C
+1xMyevj8KiNC/mvPnfKAknGXZbeYWRSIR9t2olH4tfvckXuHDwZsBE2BgATxNLG1
+nsbm68pJthBe50fr26BsG6OhTK7cYFxKOdwreEMVhW/Xj6c1rvJdWIIEys9O5N4t
+yinEEzkppNVBsFK3FdtArwxyImljL9bBpKLxq5XkR7lC0e3Dz5q6
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.udu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.udu.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.udu.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.udu.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.udu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.udu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udu.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUDdgXhHF/fFmY4C/uE1WS2GHgpZYwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLnVkdS5jYXMuY3owHhcNMTYwMzE4MDg0OTMzWhcN
+MzYwMzE4MDg0OTMzWjAZMRcwFQYDVQQDEw5pZHAudWR1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjgDKLkK7EFE1F7ykATltO3yuw23qm6
+sgNMSENfnP2qImMzDf4nmKLScVkyyzWPsmoTVMcB+WYiYG6gT+bxEMmyQfOruFrq
+mejArIup36YBrC14etLe7UemOe7IIWprPQilDNlzp0Gaehj23PNQvBwfHV9jMbLe
+iRn5YYHNd3fmn9G9qRFfnBpxjbaIH0TC67CO+qX+1Pq71LmTkA7TCH1MYRflCIv0
+E/oXVjTGvt0LFiqtRrOaYVEX/N75z6/8T3CPZdJRF1mHZoxe2x3F4fUCs6fjhrDy
+DF/VGiK3P1+oq/YKSO9xWfFfBfUe6qIjA4hX70cpyWHXVjku/03M69ECAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLnVkdS5jYXMuY3qGJWh0dHBzOi8vaWRwLnVkdS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJBCKe7lHF0NXla0FKN6rEVR
+42qDMA0GCSqGSIb3DQEBBQUAA4IBAQB0gFLUDJN/iJXYI5r9cV4/ptJUosnsB283
+JChXltB/yGffjAHQW5dUqu6JqT6xZWkqP5ECzGE3Php68Ww6xf9uZg3LpHCfV/NP
+TI9m+1u6JzuE8FxY+7pipTnqJUfdbYMVRGxWA7okyEsgxBNdQTu76AR8IA7sQ/2C
+1xMyevj8KiNC/mvPnfKAknGXZbeYWRSIR9t2olH4tfvckXuHDwZsBE2BgATxNLG1
+nsbm68pJthBe50fr26BsG6OhTK7cYFxKOdwreEMVhW/Xj6c1rvJdWIIEys9O5N4t
+yinEEzkppNVBsFK3FdtArwxyImljL9bBpKLxq5XkR7lC0e3Dz5q6
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Art History of the Academy of Sciences of the Czech Republic</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav dějin umění Akademie věd ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Art History of the Academy of Sciences of the Czech Republic</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav dějin umění Akademie věd ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.udu.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.udu.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml
index f92330b3..95a7ce25 100644
--- a/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml
@@ -21,8 +21,8 @@
         <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:Logo xml:lang="sv" height="63" width="358">https://www.umu.se/static/images/umu_logo.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="63" width="350">https://www.umu.se/static/images/umu_logo_eng.jpg</mdui:Logo>
         <mdui:Keywords xml:lang="sv">umu umea+universitet umea+university</mdui:Keywords>
         <mdui:Keywords xml:lang="en">umu umea+universitet umea+university</mdui:Keywords>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml
index 7ec6b325..ee58aab0 100644
--- a/swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml
@@ -7,8 +7,8 @@
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unistra.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Université de Strasbourg</mdui:DisplayName>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABT0lEQVQ4y8WRMUsCYRjHfy9UQ2meh4IueiCtIW0NcUcQTZGb0KQfIe4DWB9AImhpytUlLnBqykmafFucTxESAj0QQ224hjslCD2FoGd54Xn//z/P83vgv0uspS67CmAAWUBiCmtjRaMGlJDVwryXzVeAFQLKbo5W7YHpSAFga8dh7/gFqAevUHY1WrUm05FCOGGT0a8xReWnJGgCg+S+JBRz2NwuYgrnF8STo9PCbiji9D7eNYDxZKzkzy6sp+dHIxFP2jE17twf3Ck+OADpvxrgbPSdvtbtddMAakR9UxXVfm02tOFomB5Pxopv0IE2kAbOARh0NKIpuZiBR96jboqrRbJlDLyzhRM2sEZA2dX4+rxBVnMAZPTbZZSFb8oCOQYdnXbDmP9m8xVMUVwWMJsgh6yW5l3v5peYwiKgZgEW6UOdaKoOWJhCBhn/rL4BsgJm3JnI3FEAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDcrMDI6MDAsBAiyAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA3KzAyOjAwXVmwDgAAAABJRU5ErkJggg==</mdui:Logo>
diff --git a/swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml
index d925f2c5..a65f7dce 100644
--- a/swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml
@@ -19,6 +19,32 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+					      MIIDMDCCAhigAwIBAgIVAJNAAx/pIfn3JBeuoLwC9QIBjkqyMA0GCSqGSIb3DQEB
+CwUAMBwxGjAYBgNVBAMMEWlkcC51bml2LWx5b24zLmZyMB4XDTE2MDMyMjEzMzYz
+M1oXDTM2MDMyMjEzMzYzM1owHDEaMBgGA1UEAwwRaWRwLnVuaXYtbHlvbjMuZnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfbijCgX3LY/XFe5ubx774
+YWFm1IGTkY2MJJkfZi9BlHbXgeZcT0YHPpcLxrgkPcBLbO/DmFtlEHMvTe+vgEax
+wrQVkUP953VFPs0LZocTgNZsug49pvPPtzTUIDpLBg0K57ltJaG3lP8V+MYmp2ic
+zF+TG/hf8taR/fXpho9nzfjUmXNohTPJtJm8MacvzJgSdBhgnpIx7cJR9I14Bh10
+WTqFB23b1USDhbocuvZZkBJUukuaKECUV8cBLHDQqPcqxg2ssJonqBHGkhi6hsfv
+5+d2LOR22FcRwZW7bckY8Avv7FFf/S6Azku8C7KpGU0uhLqf+Wt1QaIjcoqNaWM1
+AgMBAAGjaTBnMB0GA1UdDgQWBBT8htL957q/I0ShSPdLgET2y/RhfjBGBgNVHREE
+PzA9ghFpZHAudW5pdi1seW9uMy5mcoYoaHR0cHM6Ly9pZHAudW5pdi1seW9uMy5m
+ci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAG8OJHNxf7TivPOMu
+CMngN0NrBnCv52OnNwBT9zCIwgomdmoBpObihfCVZi+99nr2ts7qNK+0RtUnSkZa
+WoMft02Hm8vIjPgANCb+VEzdHhz5NiOG67PITHQbv1y3wy3SdUOyyS43E5HE7kfl
+bR/ALgPVgZdVeHUD/+1wke0AaCwhdCkbD/IUoI11z8NvAIi4cHYNFu6EHcwebCWf
+beVYAgW2oOn1NDiGKBarnIA9/Eil38PyILcfbRZ9TSJs+nReh5YpTLe9AsDRF8Pm
+N7wNdIRYdDxrWcRJorbhwW9cZBgLUpUBbDc9ZL1iafHOYbyh7C0kqqHBmXxbgZoQ
+t0Ge9Q==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMDCCAhigAwIBAgIVALk8mZ+AAF53uwidDGYBnH0PYWxbMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkcC51bml2LWx5b24zLmZyMB4XDTEwMTAxMjEzMzk1
 NVoXDTMwMTAxMjEzMzk1NVowHDEaMBgGA1UEAxMRaWRwLnVuaXYtbHlvbjMuZnIw
diff --git a/swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml
index 515fa001..88be2781 100644
--- a/swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml
@@ -7,8 +7,8 @@
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris4.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Université de Paris IV - Sorbonne</mdui:DisplayName>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACF0lEQVQoz3WSTWtTURCGZ+ac3CbN9y3RoFBBW6ViUVRw60YXoquCv8G14Fb/gPhP6kqhoiBWUYRqFWsrWFODaWzaeJs0H/fm3HNmXAQlCnlXs3gemBdeFBH4kwE7LYgQMZANa8nkcUdOQGvCvwzBSDwGsi4ihfvVxM7KQBmKE0LxKPOPECtjPTtpouDrg16wrgRFWxQaKySsipw2tUeZ7KwunoBwJybSIz//L/RA0geNTusTxFZi45bvwI+HEcNYIUUYZ0q51DT652HvNZy6poqXGNz4DnG7vXGP/XkONniyLFYfBI9VPxgr0Pv7aWsTzYqF/UR+Dnde5ro6Xr07ymhmBgBEFBGXP0oucClSXp9dnXQ97m9C54u1hoiGjEbE4YWI1c+vnj7T08fW+jQrXnuiy41ucOXs1IzSIiICiITMPKRFJPz2hM2L73Cb+r0wlS1BvZRas+9upRdaShEzAyANp9HpdIwx4c+3STzs5126nMvE3TgkLE2FmXPGmGYzQCQA0CKWWT6ubHueMtXow1L94uW9SnVw9fr8m+er27WtQnZhfbmSyWOxUBQcYHO355zbbbSSSa/X+lUolPeCwPdLjXbtiH/IhhUeRNnyhYNOK5fLTyQVOucAECBkwcXFatBszJ/xCTxKJLc2t0/PzWxt1m/cPImgABQAITvLjkBFhBMgVsABawAHpEScoAIhTSggwigivwG84y1HTZzIHgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMB3sEi8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDQrMDI6MDBssaqTAAAAAElFTkSuQmCC</mdui:Logo>
@@ -57,8 +57,8 @@ bz0=
   </md:IDPSSODescriptor>
   <md: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris4.fr</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml
index 8b56efea..3a4fd17b 100644
--- a/swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml
@@ -7,8 +7,8 @@
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth: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>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ad.universite-lyon.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">universite-lyon.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Université de Lyon</mdui:DisplayName>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABpFBMVEUAAAAACAsACQwAn98An94AHCcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAsACQ0ACg4ACg4ACQ0ACQ0ACg4ACg4ACQwACAwAoN8Ant0AndwAndwAnt0AntwAn94An94AHCgAHCcAGiQAGyYAHCcAGyYAHCcAGiUAGiUAHCcAHSgAAAAAAAAALT8AFBsAAAAAAAAAAAAAHysAJDIAAAAAAAAAAAAAAAAAmtcASmcAAAAAAAAAc6EAgrUAAAAAAAAAAAAAl9MASGUAAAAAAAAAcZ4Af7IAAAAAAAAAl9IAS2gAAAAAAAAAc6EAf7EAAAAAAAAAh70Ae6wAAAAAAQEAkssAZo4AAAAAAAAAAAAALkAAoN8AdqUARGAAhboAndwAExsAAAAAAAAAAAAAMUUAjMQAmtcAhLgAHSgAAAAAAAAAAQEAAAAAAAAAAAAAAAD///+idxDJAAAAinRSTlMAAAAAAAACWNbuXQEKRoaEi+e0Djg8rrYrF2q+vKzfynQslkdJfYU+mBGBiomYlYiPcgQNcomIh4pgAwxtgoGCg4GBg1wDDVdjXltEX15hTgQaf4BvYnVzdwgciIp3aX58fwkbiXdxgnt/EYmAeXuCiHaAA3NzmXhzgJB+Vh2PcYCKe3ginZmedxQXELtrAAAAAWJLR0SL8m9H4AAAAAd0SU1FB+ABFxIvLWJf5LIAAADPSURBVBjTY2CAAjZ2Dk4uCJObjYeXj19AsKtLSBgsICwiKtYFAuIS3BAlklLi0jKycvIKMO2KSsoqSqpq6hpcEBWMmlraOrq6evoGhkZMIAFmYxNTM3NzczMLSysWkACrtY2tnb2Do5OziysrWI+bu4enl7ePr59/AMTQwKDgkFCGsPAI1UiIQFR0TGwcQ3xCIl8SRCA5OiU1jS09I1MNqiIrOydXIC+/oLCoGOqyktKy8orKquoamFNr6+obGpua091gAgwtfK1t7R2dICYAXRwr2hVfoiYAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTYtMDEtMjNUMTg6NDc6NDUrMDE6MDDZWb36AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE2LTAxLTIzVDE4OjQ3OjQ1KzAxOjAwqAQFRgAAAFd6VFh0UmF3IHByb2ZpbGUgdHlwZSBpcHRjAAB4nOPyDAhxVigoyk/LzEnlUgADIwsuYwsTIxNLkxQDEyBEgDTDZAMjs1Qgy9jUyMTMxBzEB8uASKBKLgDqFxF08kI1lQAAAABJRU5ErkJggg==</mdui:Logo>
diff --git a/swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml
index f53d9646..ff9a388c 100644
--- a/swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml
@@ -7,8 +7,8 @@
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ut-capitole.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Université de Toulouse 1 Capitole</mdui:DisplayName>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACsUlEQVQoz03S62sTWRzG8XN+5zIzJ5mZpE3S1JQ2rddualtWEWFXRWUXREGof4Pv/KuWfbOwvqqIZRcUKtStUKHgZYPai802zcbcJpc5M3PO8UVRfN498Hn5xb9PLaCvM1rrKKJCcN9FGEySyHZXJzHhHGF8bOg3raLI8v389Sve3IwKpU4SoBQYa77abm2/Pr4IIbLiFRBCSsrM2dNTv16njm2UVqMRcE4YM8ZYvju+fD7Y/ZSMRhgAEEJKRt6puenbvyBkgFKWFnHQ71bfJ2GIAcC2ktGofPcWdWyjNSBjWEoUf7rU3Npm6XTY/Lzz5+rwqDG+WNlbfbL/aM3ECQaSDEcnblzVUQxKRmNLFaAsdWKyv3+w83BVlCYrD+67c2UdxcOjxt6jNWLzqNt18jmnmCd3mZf94Sx1bOLYh+sv4qAvJifERL5T/eCfnCXc6u3sWRnPzuUwRkYpOrtyJz09JdudsNkKm01MgAnhlmdUKJ1iwSjV+7jb36+NLS4Ma4eFSxeAZ3wqHO57GGNkEEIIGMtfXHbLM/Xn/9SerstuFxkEBMJmi9o2ufJvjXkuTQngfHBQS4KBKE3KTocKp/b3s+DjLjIme+60U5wQE/n6xiZgQlQojTYYIPfjUiIl993O2yowmpk/QzinQninZmWrraN4WDsk9zLFqBfkFis6ip3cuJXxjUqsbLb95l3UDXQcl25etcayGOGw1W5sbgEGkM1W4+UWc1P7j/+K+4NUqdStvu+8rRqtSzev1ddfNDZe0rSor28AELLiFYDSwUGNcJ6ZP/P/5lbnXXV8qTK2MG9nM9Xf/nAKufyF5YO1p4P6ETCGv9WqpHTL08WfL6tRGA+G3EvrRLGUiHrBf8+ex70AOEcI4e/z1nGCkHEKeWJbCGGjVNzvy1YHOMMAx+YLtBpGsTIWf64AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDDaTHhbAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA4KzAyOjAwqxHA5wAAAABJRU5ErkJggg==</mdui:Logo>
diff --git a/swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml
index cb4324bb..3625e334 100644
--- a/swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml
@@ -20,8 +20,8 @@
       <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 height="16" width="16">https://www.vetmeduni.ac.at/favicon.ico</mdui:Logo>
-        <mdui:Logo height="69" width="231">https://www.vetmeduni.ac.at/fileadmin/vetmed/img/logo.gif</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://www.vetmeduni.ac.at/favicon.ico</mdui:Logo>
+        <mdui:Logo width="231" height="69">https://www.vetmeduni.ac.at/fileadmin/vetmed/img/logo.gif</mdui:Logo>
         <mdui:InformationURL xml:lang="de">http://www.vetmeduni.ac.at/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.vetmeduni.ac.at/en/</mdui:InformationURL>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.winchester.ac.uk-shibboleth.xml
index a0a1af26..f5d61239 100644
--- a/swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml
+++ b/swamid-interfederations-2.0/idp.winchester.ac.uk-shibboleth.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.athukfed2.openathens.net/openathens">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.winchester.ac.uk/shibboleth">
   <!--
-		This is an OpenAthens MD "athukfed2" IdP for Eduserv.
+		This is an IdP (owned by Eduserv) for the University of Winchester.
 	-->
   <Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-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"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-01T17:03:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+  <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">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed2.openathens.net</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">winchester.ac.uk</shibmd:Scope>
     </Extensions>
     <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -44,15 +41,7 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfederation"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed2.openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -81,12 +70,13 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
-  </AttributeAuthorityDescriptor>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/winchester.ac.uk/c/ukfed"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/winchester.ac.uk/c/ukfed"/>
+  </IDPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv athukfed2</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
+    <OrganizationDisplayName xml:lang="en">University of Winchester</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.winchester.ac.uk/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>Athens Helpdesk</GivenName>
diff --git a/swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml b/swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml
index 8cf0cfd7..ede41428 100644
--- a/swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml
+++ b/swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml
@@ -17,8 +17,8 @@
       <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 height="92" width="95">https://idp.zid.tuwien.ac.at/fileadmin/zid/images/zid/TU-Logo09.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.tuwien.ac.at/fileadmin/tuw/main/images/favicon.ico</mdui:Logo>
+        <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">
diff --git a/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml
index 37b1ae3c..e31111cb 100644
--- a/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml
@@ -16,6 +16,42 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+						MIIFFDCCA/ygAwIBAgIUfvk+kIvgObeH9FlTOzyxUUtzNfEwDQYJKoZIhvcNAQEL
+						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDMzMDEwMjEz
+						OFoXDTE5MDMzMDEwMjEzNFowgZsxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlXaWx0
+						c2hpcmUxEDAOBgNVBAcTB1NXSU5ET04xMjAwBgNVBAoTKVNjaWVuY2UgYW5kIFRl
+						Y2hub2xvZ3kgRmFjaWxpdGllcyBDb3VuY2lsMRAwDgYDVQQLEwdSQUwtQ1NEMSAw
+						HgYDVQQDExdzaGliYm9sZXRoMDEuc3RmYy5hYy51azCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAIfVik5J16T3kGyLocrYaK+15zqqqQN/h4RYYRVYSsPk
+						MX7srSQJq1nt/svUTKWBllfwySXccVX2YhgM/nuTbJtf6yKGNq1ZogsjRZv1m2rr
+						yOHVwQEpFpGfdt0MmXVR1bvEi5O3+U+Ian6A8oTQMgmhVCXCTTdt3fAeYqN6DlwQ
+						38JPFhIlbyEhrUgCnZeE19ftAdfAiwXD2bJy0hnuMh7j8PKIwsWkAx0a8BdQ1LKR
+						/TgJhluGVZiMXgS4cljX0SJS9+eXIvNC1V+EMM03dOrP1mPJIfxY2mrEfwDbhC9H
+						1OKRqdDYnHUTYNCSvhDiApRK7ApeobEqolHOr3cWfG0CAwEAAaOCAZswggGXMHMG
+						CCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+						bG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+						YWwuY29tL3F2c3NsZzIuY3J0MCIGA1UdEQQbMBmCF3NoaWJib2xldGgwMS5zdGZj
+						LmFjLnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEW
+						KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0P
+						AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSME
+						GDAWgBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRw
+						Oi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQU
+						Tw22e+slTxSJFHTxYGz0C7Mw4gowDQYJKoZIhvcNAQELBQADggEBAHh9RRtAH0lX
+						RcmNtw4jrDkcdnJcwjaddVpfQfVvIFGqB4NkKOmccYugppso5+UEHcpHivsMcKAa
+						Qok/yANO6fNzdKCjZIApV9Q9rpwIQSbJlXbg/DvUYc9mqeUKOMlIzw3Q+G1XK4o8
+						B5HfGyldcM8X+NyiC8tocRG4iFdMT2J4M1cIfeDn9xHPDzWex9bZLktLkssdzjtw
+						iKTQHPv55BOqJ12e0rTNTilpErtzr5AhYXDKKNYAHTYxHcyI75aqE+/11dsHdOKb
+						oUdCBAJx12/CTfHNdDOdr7FHk4fwcUsCvAUTL8hSwSv+fu00lpRe/UoMk26E4Xkv
+						ayT9vCad35E=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIRAMB2hFT3mLr5ROiokXWKNqowDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA0MjYwMDAwMDBaFw0xNjA0MjUyMzU5NTlaMEUxITAfBgNV
@@ -61,6 +97,42 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+						MIIFFDCCA/ygAwIBAgIUfvk+kIvgObeH9FlTOzyxUUtzNfEwDQYJKoZIhvcNAQEL
+						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDMzMDEwMjEz
+						OFoXDTE5MDMzMDEwMjEzNFowgZsxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlXaWx0
+						c2hpcmUxEDAOBgNVBAcTB1NXSU5ET04xMjAwBgNVBAoTKVNjaWVuY2UgYW5kIFRl
+						Y2hub2xvZ3kgRmFjaWxpdGllcyBDb3VuY2lsMRAwDgYDVQQLEwdSQUwtQ1NEMSAw
+						HgYDVQQDExdzaGliYm9sZXRoMDEuc3RmYy5hYy51azCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAIfVik5J16T3kGyLocrYaK+15zqqqQN/h4RYYRVYSsPk
+						MX7srSQJq1nt/svUTKWBllfwySXccVX2YhgM/nuTbJtf6yKGNq1ZogsjRZv1m2rr
+						yOHVwQEpFpGfdt0MmXVR1bvEi5O3+U+Ian6A8oTQMgmhVCXCTTdt3fAeYqN6DlwQ
+						38JPFhIlbyEhrUgCnZeE19ftAdfAiwXD2bJy0hnuMh7j8PKIwsWkAx0a8BdQ1LKR
+						/TgJhluGVZiMXgS4cljX0SJS9+eXIvNC1V+EMM03dOrP1mPJIfxY2mrEfwDbhC9H
+						1OKRqdDYnHUTYNCSvhDiApRK7ApeobEqolHOr3cWfG0CAwEAAaOCAZswggGXMHMG
+						CCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+						bG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+						YWwuY29tL3F2c3NsZzIuY3J0MCIGA1UdEQQbMBmCF3NoaWJib2xldGgwMS5zdGZj
+						LmFjLnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEW
+						KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0P
+						AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSME
+						GDAWgBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRw
+						Oi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQU
+						Tw22e+slTxSJFHTxYGz0C7Mw4gowDQYJKoZIhvcNAQELBQADggEBAHh9RRtAH0lX
+						RcmNtw4jrDkcdnJcwjaddVpfQfVvIFGqB4NkKOmccYugppso5+UEHcpHivsMcKAa
+						Qok/yANO6fNzdKCjZIApV9Q9rpwIQSbJlXbg/DvUYc9mqeUKOMlIzw3Q+G1XK4o8
+						B5HfGyldcM8X+NyiC8tocRG4iFdMT2J4M1cIfeDn9xHPDzWex9bZLktLkssdzjtw
+						iKTQHPv55BOqJ12e0rTNTilpErtzr5AhYXDKKNYAHTYxHcyI75aqE+/11dsHdOKb
+						oUdCBAJx12/CTfHNdDOdr7FHk4fwcUsCvAUTL8hSwSv+fu00lpRe/UoMk26E4Xkv
+						ayT9vCad35E=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIRAMB2hFT3mLr5ROiokXWKNqowDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA0MjYwMDAwMDBaFw0xNjA0MjUyMzU5NTlaMEUxITAfBgNV
diff --git a/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml
index 7aea853a..ef9cce30 100644
--- a/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml
@@ -16,6 +16,42 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+						MIIFFDCCA/ygAwIBAgIUOysRoBktqggd9zGS+JJEfPcJmKwwDQYJKoZIhvcNAQEL
+						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDQwNTEyNDUz
+						NVoXDTE5MDQwNTEyNDUzM1owgZsxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlXaWx0
+						c2hpcmUxEDAOBgNVBAcTB1NXSU5ET04xMjAwBgNVBAoTKVNjaWVuY2UgYW5kIFRl
+						Y2hub2xvZ3kgRmFjaWxpdGllcyBDb3VuY2lsMRAwDgYDVQQLEwdSQUwtQ1NEMSAw
+						HgYDVQQDExdzaGliYm9sZXRoMDIuc3RmYy5hYy51azCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAMvR27pSvNdN412CLQs9mwht4/x7X7GFyo95R7M2ebA8
+						NiWWpeO1a39mQAy0aA3jgI3dLM7FkvTAAe3PwjGG1ONoNzXkdF2ys+C4jf9Tgsl7
+						grv50GeFEckUUrvzgaMyZHZZmOwX9oc6AQCPw57f2UHv58LWYivz1Mmvp2JmnUiu
+						UX574cgLN/KnRMTWl4sWvU3nwY+ZurTI8pj2B6Zj28hlPFbl6lNqd8jlT1j3+O1o
+						+7ubSVvRV5rYy2CWxjGYDxEnm+dAoR7si3XxubiWXe4KIBwvbE9ZQMMjQ3d3cw5T
+						lQwv9S9UQGEfNmDLZnRhzOit8KPqDk/p3Lc29mp/9nMCAwEAAaOCAZswggGXMHMG
+						CCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+						bG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+						YWwuY29tL3F2c3NsZzIuY3J0MCIGA1UdEQQbMBmCF3NoaWJib2xldGgwMi5zdGZj
+						LmFjLnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEW
+						KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0P
+						AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSME
+						GDAWgBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRw
+						Oi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQU
+						bJMoUGiBSfBEYv7zyHqX1fXLSkcwDQYJKoZIhvcNAQELBQADggEBAL1K6/RF+FdG
+						0xpK1XVOvFsihV5P4OLXk9qhHh+CnKfDfqbJZTvppj1or7bi0D4GyIZQRqF19z4n
+						dPB9ckfJF9YvyfR7uobHUJBm644hsxa5DTAMug0nHnDnHN/ueE0fBc8Vr2N0adZV
+						rlVcGRjXiBVPxfTk637ZIXShW+8923IIU/eECYc7Vvpe7giXfRF9SbFtAZ9/Rdjm
+						YWMVdt0nBLwXSCdh4IIKHHnu4qq6Z0/RpWmA6iL/Y/hJzQAohoU/K7jGqPOMm9wF
+						ggRFV+FROzADdEtB2psKL+LrWhSGhRewqazW7eYB8Y9JGN1UnsE6NWyVru1LMYte
+						IklcmjJ+40A=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIRAN6xh7bD0R7q1gDhMLxcIlYwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA0MjUwMDAwMDBaFw0xNjA0MjQyMzU5NTlaMEUxITAfBgNV
@@ -61,6 +97,42 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+						MIIFFDCCA/ygAwIBAgIUOysRoBktqggd9zGS+JJEfPcJmKwwDQYJKoZIhvcNAQEL
+						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDQwNTEyNDUz
+						NVoXDTE5MDQwNTEyNDUzM1owgZsxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlXaWx0
+						c2hpcmUxEDAOBgNVBAcTB1NXSU5ET04xMjAwBgNVBAoTKVNjaWVuY2UgYW5kIFRl
+						Y2hub2xvZ3kgRmFjaWxpdGllcyBDb3VuY2lsMRAwDgYDVQQLEwdSQUwtQ1NEMSAw
+						HgYDVQQDExdzaGliYm9sZXRoMDIuc3RmYy5hYy51azCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAMvR27pSvNdN412CLQs9mwht4/x7X7GFyo95R7M2ebA8
+						NiWWpeO1a39mQAy0aA3jgI3dLM7FkvTAAe3PwjGG1ONoNzXkdF2ys+C4jf9Tgsl7
+						grv50GeFEckUUrvzgaMyZHZZmOwX9oc6AQCPw57f2UHv58LWYivz1Mmvp2JmnUiu
+						UX574cgLN/KnRMTWl4sWvU3nwY+ZurTI8pj2B6Zj28hlPFbl6lNqd8jlT1j3+O1o
+						+7ubSVvRV5rYy2CWxjGYDxEnm+dAoR7si3XxubiWXe4KIBwvbE9ZQMMjQ3d3cw5T
+						lQwv9S9UQGEfNmDLZnRhzOit8KPqDk/p3Lc29mp/9nMCAwEAAaOCAZswggGXMHMG
+						CCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+						bG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+						YWwuY29tL3F2c3NsZzIuY3J0MCIGA1UdEQQbMBmCF3NoaWJib2xldGgwMi5zdGZj
+						LmFjLnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEW
+						KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0P
+						AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSME
+						GDAWgBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRw
+						Oi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQU
+						bJMoUGiBSfBEYv7zyHqX1fXLSkcwDQYJKoZIhvcNAQELBQADggEBAL1K6/RF+FdG
+						0xpK1XVOvFsihV5P4OLXk9qhHh+CnKfDfqbJZTvppj1or7bi0D4GyIZQRqF19z4n
+						dPB9ckfJF9YvyfR7uobHUJBm644hsxa5DTAMug0nHnDnHN/ueE0fBc8Vr2N0adZV
+						rlVcGRjXiBVPxfTk637ZIXShW+8923IIU/eECYc7Vvpe7giXfRF9SbFtAZ9/Rdjm
+						YWMVdt0nBLwXSCdh4IIKHHnu4qq6Z0/RpWmA6iL/Y/hJzQAohoU/K7jGqPOMm9wF
+						ggRFV+FROzADdEtB2psKL+LrWhSGhRewqazW7eYB8Y9JGN1UnsE6NWyVru1LMYte
+						IklcmjJ+40A=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIRAN6xh7bD0R7q1gDhMLxcIlYwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA0MjUwMDAwMDBaFw0xNjA0MjQyMzU5NTlaMEUxITAfBgNV
diff --git a/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml
index e8c4aa57..38aa3a02 100644
--- a/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml
@@ -7,8 +7,8 @@
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-aix.net</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">CROUS Aix Marseille</mdui:DisplayName>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAACKElEQVR42k1STWsUQRCtqp6P3ZlNNCuKCSRuNkeFaNQ9RkxQcE+KqAiCiAavQkTUgwQhguLXvzAegl5EDxH/gejBUzY3D0aISNaZ2dmd7rKmJ5ukDg1V/erVq+6HYIMADEAFYFGFF8k3/eKySR/qKAJAALZFhH5yFt37KqijItgJ6Vxj/UTHn7lXwFABaIA7VHqgAkGkUkLcbmDmksW90MkzkwgXCfoMuoLuAMQWzbtCUtEjV/MqmAZHBtIQYM6NaJgdQRdCJSifI6ljr0T3ghPKkvhahefJR7uiEELOStwVaRpLYSFbigZYAS7pFH+6VWM5C8mCNr2OMzpKA4PdH9+2ePKTDGQamIxAizXzuWiyrho5GFy7QvVhf+Z0uXkuuHzJa5x0TxwtN5t7b92kHMcFN4I2YHpABFpzp+Mdn1LjY/7sKX92unL7hjd5JJy7biXJDEA2Bish+p7Z2PCmjklbttoCw6pey1bX1Miw/rUOtTF8pcIL5BMhdxO/0XAnD3e/fnfGD7EIThI6sN+027JY9O6DYngLbXqs4xbrEqAuto4TZ6LGaYoO6T9/46Xl9NOX6ONK2fNaLi2Q3XYG3TfuYMdoqA65ewZoX5V7GUcRb/7T6781EjGXSV3NNnODFLa7R+V5J4BelnCG+Ttai6Fi1y1x/pkvdfLUWmPHfDLnkRNMoMNbXspfT3wighd1vLJtvt32lvO5/XjXFnsA7016V0emD5D4DxLK/P0UpMMMAAAAAElFTkSuQmCC</mdui:Logo>
diff --git a/swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml
index 0219febc..44b1fb14 100644
--- a/swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml
@@ -14,8 +14,8 @@
         <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:Logo xml:lang="sv" height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml
index d9579f09..2a575de4 100644
--- a/swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml
@@ -14,7 +14,7 @@
         <mdui:DisplayName xml:lang="el">Χαροκόπειο Πανεπιστήμιο</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">http://www.hua.gr/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="el">http://www.hua.gr/</mdui:InformationURL>
-        <mdui:Logo height="81" width="83">https://idp.hua.gr/logo.png</mdui:Logo>
+        <mdui:Logo width="83" height="81">https://idp.hua.gr/logo.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:IPHint>195.130.90.0/23</mdui:IPHint>
diff --git a/swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml
index 9a00b2af..14429c69 100644
--- a/swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml
@@ -15,8 +15,8 @@
         <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:Logo xml:lang="sv" height="103" width="200">http://www.hv.se/Media/Get/17595/svensk-logotyp-200x103</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="103" width="200">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>
diff --git a/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml
index d9651401..68b9d700 100644
--- a/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml
@@ -16,8 +16,8 @@
         <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:Logo xml:lang="sv" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
         <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
diff --git a/swamid-interfederations-2.0/idp3.kirkleescollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp3.kirkleescollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 0c5542e8..00000000
--- a/swamid-interfederations-2.0/idp3.kirkleescollege.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp3.kirkleescollege.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Kirklees College.
-	-->
-  <Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-09T10:23:23Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kirkleescollege.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Kirklees College - Testing - Do Not Use</mdui:DisplayName>
-        <mdui:Logo height="67" width="137">https://www.kirkleescollege.ac.uk/wp-content/uploads/2015/06/kcLogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUzCCAjugAwIBAgIUPzSZlLFegyJ/xf53eryEDjcKM9EwDQYJKoZIhvcNAQEL
-						BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
-						MzAzMTAxODQ3WhcNMzYwMzAzMTAxODQ3WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
-						ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AKFBdTJWYZwbKzqpd8kbX4j1SX+EN2WBSYWvgYJLQFFkwMcxKjPzEJUPoR3aMu5T
-						oTEm+oTERSALbbddvE7pnXSqYOWK446LwsyeFLKF8h7xYreM85yPmorsFAaaTUuI
-						wvx59BHDuSkiVZwwsm3+WB14Ahcg429whwNY9apF1udu5xE6BMF7I+QtUNJCDhz1
-						vgVS41JfkQiwbNPZlvfe8S14s3bWOIwp9l+G2f8cRNH5Uf5y9ZuX2tB8eDAZ6cDT
-						ID6udXsErJSCbosX4uykvlnD6Djr+7TQNwJqVZFRNbWki/sl41GYuqvlM/A/u04H
-						n2MCvHwjUQTtBrTpIZZXxpUCAwEAAaN7MHkwHQYDVR0OBBYEFLpm52vzFVDyJS4o
-						hPpCfXJG6n0jMFgGA1UdEQRRME+CGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVr
-						hjFodHRwczovL2lkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9s
-						ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBREprxYckkBIaZYmAYDei1C2pe23kl9exH
-						4aWKmPNARm7o4Cy7dd3j3uwC8St+4qEKCpFQXy2Dat/WcXoXNYUqARRvF5yPNyo7
-						zyIajiKzdHTKfb6fUAfStmRQ2f7iWVCB25A/e1vo3AnoJ3S0X7YBo8k6uR7Vh4Tv
-						ezlyLCERRgKTuhxVI2eZ6/pO7Nxfk+m6VznnRQY/uyOUdq5hYT8kR7IC8QEJN0uM
-						JBwwLSL7JuEb/lyeuxXMQ0Uadl2f68HdgycsUKbGCRdskzL49x1MNcyqrT9e+FFM
-						dgIVva94fIIj02YnTFHvjX1CIoHAh/0Tg/xMHLUeJyrCLp9i8iJG
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUzCCAjugAwIBAgIUd97fOFDggCwIB+n7K8vwH2yP6mUwDQYJKoZIhvcNAQEL
-						BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
-						MzAzMTAxODQ2WhcNMzYwMzAzMTAxODQ2WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
-						ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AOD7ENmi+diQEZsfujuo48nhfyIImo63I1dxn8DcDkMAwQu5Bp01bOIoB6fvJd6+
-						yxUI5Ny7cH6BIkfoGC/4kc+9YaTmjdQ2Lqz5FFB6sZNx/zTK6ovTS0M855KFbTjx
-						iaomSW/ZA4khQWLDpNf7kSbqRNYprwvB84ySF5IDhhy1j6uMsTTBzfWVswbq7ioo
-						AxWHH/F1URF8Ke2zyJPZcVmESj6hb0kaJ65neFkdKdk1tePySVT1iiqTZXW+nbR1
-						q+2JbC8CG0uzKn6uqcnBwsjMw/tHqnzL4yoXyHsg1bzNpN+Fhjvqxiqre+0VN01D
-						qCZVnIGvcPPI1JQXtGBUgRECAwEAAaN7MHkwHQYDVR0OBBYEFHR4kkaJLgI7EJAa
-						m+vQbnIupiAyMFgGA1UdEQRRME+CGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVr
-						hjFodHRwczovL2lkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9s
-						ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQC6blnSTG9YG9r1kyqXwX46qtU/R3GDzZNQ
-						pHSMzTZ5u5B6t3/UM9bIPlHtPS6hilFY5Hmr+VsPA0y0xAX6C35UiNAEk8U6LD4O
-						AWvkqBQEMsoANTZa2g2hbpyEBdF2eTJZcxrSbDfrQ6zFRavwb1yeuFpp61CJEKNB
-						002kcyWHo6I4ywgwvKjy0XeUjHakskUSkHz1/Vk/jCjOP7+BX5kptY0gbh/NLzri
-						uLubDQXxFYEriQdqBU7xzKtZO8Uvh4bHSgbh2PlsHwNrn3Pz1j7HJUUinQjx11F1
-						uXzeRs4SkLVanB/ZfQiRhdtDaRsNRrXMBWDLn/zeJiTcyusUtHtf
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVDCCAjygAwIBAgIVAKB3QrzbWC6UDhYtgWKIpucJuo+aMA0GCSqGSIb3DQEB
-						CwUAMCUxIzAhBgNVBAMMGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrMB4XDTE2
-						MDMwMzEwMTg0N1oXDTM2MDMwMzEwMTg0N1owJTEjMCEGA1UEAwwaaWRwMy5raXJr
-						bGVlc2NvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCBPFW/kyCkFVmfkrRrJYeZbtZZ+idr82BMiORf3wNIFRVe0Dzcgm3G9zdiI/tv
-						Y32ipWUS2msYQXXJ8CGU2GcgNjSCUUffGc/Mi5UbKXZsOZWshBavumBHELDahOKc
-						F1V8msTgiKTdckuvkwjyLAokVDGWeZ1HBlDF1EBeKxPxDTnIeknlE4suuFPLHKkQ
-						kCup+ncBh8ZODGInHHb57xonZKxubqZPRk6K3za6K6eW4uu7R6cigZDUmoNMi/QN
-						SrFvyXG+5e+8OA6MbttCNreVto2AAm0cb7OWtLmYYCz95G4UtFRRzScFJWePbnGu
-						KzYL080NVr+ugb/+ttkfbNG1AgMBAAGjezB5MB0GA1UdDgQWBBSJF8N8bCvvPNCu
-						fB3kL4jFg8jIrDBYBgNVHREEUTBPghppZHAzLmtpcmtsZWVzY29sbGVnZS5hYy51
-						a4YxaHR0cHM6Ly9pZHAzLmtpcmtsZWVzY29sbGVnZS5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAAqmGm2DuWPXogXtQzwMy/eymOtwG1mKG
-						FUBGI6RKzFBhv0IC0qnwzsJ931x/Y79e9usKreMxaWJinOm8IcKDUzyHBrtosmbi
-						T+b3BxArTXDAWnKuel4OVuVUJnndfBcWvxJrGmj3ueb/S2EsbkmnwXMXawXFATV8
-						IAdC/EErq8wNXbbRlkbeX+ibMsgHDMofY/WL0QmC+1kJO8KGoNPOje4aDYzvkCcs
-						f/H76DoF7VcK7V5hujvHlb0P51EAA15gDfywo8GT3S8M5OrSYmFoL8p0/NrQ16lB
-						hRIYrS+7nU8Dmaso2COWvd0q91Gb0tAQx+Qamj5LcT+mdcQ636jf0g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kirkleescollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUzCCAjugAwIBAgIUPzSZlLFegyJ/xf53eryEDjcKM9EwDQYJKoZIhvcNAQEL
-						BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
-						MzAzMTAxODQ3WhcNMzYwMzAzMTAxODQ3WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
-						ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AKFBdTJWYZwbKzqpd8kbX4j1SX+EN2WBSYWvgYJLQFFkwMcxKjPzEJUPoR3aMu5T
-						oTEm+oTERSALbbddvE7pnXSqYOWK446LwsyeFLKF8h7xYreM85yPmorsFAaaTUuI
-						wvx59BHDuSkiVZwwsm3+WB14Ahcg429whwNY9apF1udu5xE6BMF7I+QtUNJCDhz1
-						vgVS41JfkQiwbNPZlvfe8S14s3bWOIwp9l+G2f8cRNH5Uf5y9ZuX2tB8eDAZ6cDT
-						ID6udXsErJSCbosX4uykvlnD6Djr+7TQNwJqVZFRNbWki/sl41GYuqvlM/A/u04H
-						n2MCvHwjUQTtBrTpIZZXxpUCAwEAAaN7MHkwHQYDVR0OBBYEFLpm52vzFVDyJS4o
-						hPpCfXJG6n0jMFgGA1UdEQRRME+CGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVr
-						hjFodHRwczovL2lkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9s
-						ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBREprxYckkBIaZYmAYDei1C2pe23kl9exH
-						4aWKmPNARm7o4Cy7dd3j3uwC8St+4qEKCpFQXy2Dat/WcXoXNYUqARRvF5yPNyo7
-						zyIajiKzdHTKfb6fUAfStmRQ2f7iWVCB25A/e1vo3AnoJ3S0X7YBo8k6uR7Vh4Tv
-						ezlyLCERRgKTuhxVI2eZ6/pO7Nxfk+m6VznnRQY/uyOUdq5hYT8kR7IC8QEJN0uM
-						JBwwLSL7JuEb/lyeuxXMQ0Uadl2f68HdgycsUKbGCRdskzL49x1MNcyqrT9e+FFM
-						dgIVva94fIIj02YnTFHvjX1CIoHAh/0Tg/xMHLUeJyrCLp9i8iJG
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUzCCAjugAwIBAgIUd97fOFDggCwIB+n7K8vwH2yP6mUwDQYJKoZIhvcNAQEL
-						BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
-						MzAzMTAxODQ2WhcNMzYwMzAzMTAxODQ2WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
-						ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AOD7ENmi+diQEZsfujuo48nhfyIImo63I1dxn8DcDkMAwQu5Bp01bOIoB6fvJd6+
-						yxUI5Ny7cH6BIkfoGC/4kc+9YaTmjdQ2Lqz5FFB6sZNx/zTK6ovTS0M855KFbTjx
-						iaomSW/ZA4khQWLDpNf7kSbqRNYprwvB84ySF5IDhhy1j6uMsTTBzfWVswbq7ioo
-						AxWHH/F1URF8Ke2zyJPZcVmESj6hb0kaJ65neFkdKdk1tePySVT1iiqTZXW+nbR1
-						q+2JbC8CG0uzKn6uqcnBwsjMw/tHqnzL4yoXyHsg1bzNpN+Fhjvqxiqre+0VN01D
-						qCZVnIGvcPPI1JQXtGBUgRECAwEAAaN7MHkwHQYDVR0OBBYEFHR4kkaJLgI7EJAa
-						m+vQbnIupiAyMFgGA1UdEQRRME+CGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVr
-						hjFodHRwczovL2lkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9s
-						ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQC6blnSTG9YG9r1kyqXwX46qtU/R3GDzZNQ
-						pHSMzTZ5u5B6t3/UM9bIPlHtPS6hilFY5Hmr+VsPA0y0xAX6C35UiNAEk8U6LD4O
-						AWvkqBQEMsoANTZa2g2hbpyEBdF2eTJZcxrSbDfrQ6zFRavwb1yeuFpp61CJEKNB
-						002kcyWHo6I4ywgwvKjy0XeUjHakskUSkHz1/Vk/jCjOP7+BX5kptY0gbh/NLzri
-						uLubDQXxFYEriQdqBU7xzKtZO8Uvh4bHSgbh2PlsHwNrn3Pz1j7HJUUinQjx11F1
-						uXzeRs4SkLVanB/ZfQiRhdtDaRsNRrXMBWDLn/zeJiTcyusUtHtf
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVDCCAjygAwIBAgIVAKB3QrzbWC6UDhYtgWKIpucJuo+aMA0GCSqGSIb3DQEB
-						CwUAMCUxIzAhBgNVBAMMGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrMB4XDTE2
-						MDMwMzEwMTg0N1oXDTM2MDMwMzEwMTg0N1owJTEjMCEGA1UEAwwaaWRwMy5raXJr
-						bGVlc2NvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCBPFW/kyCkFVmfkrRrJYeZbtZZ+idr82BMiORf3wNIFRVe0Dzcgm3G9zdiI/tv
-						Y32ipWUS2msYQXXJ8CGU2GcgNjSCUUffGc/Mi5UbKXZsOZWshBavumBHELDahOKc
-						F1V8msTgiKTdckuvkwjyLAokVDGWeZ1HBlDF1EBeKxPxDTnIeknlE4suuFPLHKkQ
-						kCup+ncBh8ZODGInHHb57xonZKxubqZPRk6K3za6K6eW4uu7R6cigZDUmoNMi/QN
-						SrFvyXG+5e+8OA6MbttCNreVto2AAm0cb7OWtLmYYCz95G4UtFRRzScFJWePbnGu
-						KzYL080NVr+ugb/+ttkfbNG1AgMBAAGjezB5MB0GA1UdDgQWBBSJF8N8bCvvPNCu
-						fB3kL4jFg8jIrDBYBgNVHREEUTBPghppZHAzLmtpcmtsZWVzY29sbGVnZS5hYy51
-						a4YxaHR0cHM6Ly9pZHAzLmtpcmtsZWVzY29sbGVnZS5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAAqmGm2DuWPXogXtQzwMy/eymOtwG1mKG
-						FUBGI6RKzFBhv0IC0qnwzsJ931x/Y79e9usKreMxaWJinOm8IcKDUzyHBrtosmbi
-						T+b3BxArTXDAWnKuel4OVuVUJnndfBcWvxJrGmj3ueb/S2EsbkmnwXMXawXFATV8
-						IAdC/EErq8wNXbbRlkbeX+ibMsgHDMofY/WL0QmC+1kJO8KGoNPOje4aDYzvkCcs
-						f/H76DoF7VcK7V5hujvHlb0P51EAA15gDfywo8GT3S8M5OrSYmFoL8p0/NrQ16lB
-						hRIYrS+7nU8Dmaso2COWvd0q91Gb0tAQx+Qamj5LcT+mdcQ636jf0g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Kirklees College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Kirklees College - Testing - Do Not Use</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kirkleescollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sam</GivenName>
-    <SurName>Lim</SurName>
-    <EmailAddress>mailto:slim@kirkleescollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sam</GivenName>
-    <SurName>Lim</SurName>
-    <EmailAddress>mailto:slim@kirkleescollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp4.londonlibrary.co.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp4.londonlibrary.co.uk-idp-shibboleth.xml
index 21f46513..bfb366ad 100644
--- a/swamid-interfederations-2.0/idp4.londonlibrary.co.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp4.londonlibrary.co.uk-idp-shibboleth.xml
@@ -20,32 +20,6 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIDSzCCAjOgAwIBAgIULfDJ5o3owhjy1YOpOD4avPZuJlcwDQYJKoZIhvcNAQEL
-						BQAwIzEhMB8GA1UEAwwYaWRwNC5sb25kb25saWJyYXJ5LmNvLnVrMB4XDTE1MTIy
-						MzE0MzYzNloXDTM1MTIyMzE0MzYzNlowIzEhMB8GA1UEAwwYaWRwNC5sb25kb25s
-						aWJyYXJ5LmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwFjZ
-						ekfyeZuLgeDJIl07nr28EpJr9UmRyCwSV9+s1fNphovrOakOhFdLwR0PfkFftew9
-						oEnR9+yXRe/ST85CeuFfQOtAUjEySejV8J7b6ajx34GB2+GBVwjfUPfjJ5I6Q8/V
-						u6tSath3XWTV8YDYbeKZ+xqeLEz4NA7HjTm2lODL/pgBdSjEKsZzfRy+DmHQnwSn
-						MuvAsbn23A5CDQl0cCZmdwZbj1OKN0x2Xx14txRJ+39gGDmj6PrjRqDq77KPKbPx
-						RB9tOY2O5VnNhWdtDvc7ZC/9ZUYUW5vLOVKm/DjwkOdKGZpz/gwWWqaPhZgySpUw
-						nYYvot+cW/PRaBjWlQIDAQABo3cwdTAdBgNVHQ4EFgQUNl2xUBbzKnp2sitJT4KI
-						1WrGLVkwVAYDVR0RBE0wS4IYaWRwNC5sb25kb25saWJyYXJ5LmNvLnVrhi9odHRw
-						czovL2lkcDQubG9uZG9ubGlicmFyeS5jby51ay9pZHAvc2hpYmJvbGV0aDANBgkq
-						hkiG9w0BAQsFAAOCAQEAZ/eSdTOlLZ8Bwn3nnqtRONJla2FeMjVZgPmDWO5N1oRi
-						a50aDAG1zRAAO4SiPhRBaz4LVIkK35n57A2cZJuafJ1WESFlGMEOXAht+j8FOq8J
-						mlX3Z+QgafmTH/objfdwZ5tODP8WWYCmRwfiS3AlCcTGGECkpeqQ9TRMZ5gkWEmw
-						JFSESbYTyhI+KZ6k7nnSLdasA/L6bL4ZFoNoEYMydD3hpL7r35jq0chcUDbkf4Aj
-						4qbYYT12W7Zlj6FCwl1Xzz/7+OpSlG1xutclWkPnjclasTdKLGJUjpxekePpbtXa
-						VITnAykYlAMJ69EX9lvbTqH9sTTAQpFLjOVwMGlWsQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIVANU4ahFCyREJu8AncXjGLDT0D6P3MA0GCSqGSIb3DQEB
 						CwUAMCMxITAfBgNVBAMMGGlkcDQubG9uZG9ubGlicmFyeS5jby51azAeFw0xNTEy
 						MjMxNDM2MzVaFw0zNTEyMjMxNDM2MzVaMCMxITAfBgNVBAMMGGlkcDQubG9uZG9u
@@ -143,32 +117,6 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIDSzCCAjOgAwIBAgIULfDJ5o3owhjy1YOpOD4avPZuJlcwDQYJKoZIhvcNAQEL
-						BQAwIzEhMB8GA1UEAwwYaWRwNC5sb25kb25saWJyYXJ5LmNvLnVrMB4XDTE1MTIy
-						MzE0MzYzNloXDTM1MTIyMzE0MzYzNlowIzEhMB8GA1UEAwwYaWRwNC5sb25kb25s
-						aWJyYXJ5LmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwFjZ
-						ekfyeZuLgeDJIl07nr28EpJr9UmRyCwSV9+s1fNphovrOakOhFdLwR0PfkFftew9
-						oEnR9+yXRe/ST85CeuFfQOtAUjEySejV8J7b6ajx34GB2+GBVwjfUPfjJ5I6Q8/V
-						u6tSath3XWTV8YDYbeKZ+xqeLEz4NA7HjTm2lODL/pgBdSjEKsZzfRy+DmHQnwSn
-						MuvAsbn23A5CDQl0cCZmdwZbj1OKN0x2Xx14txRJ+39gGDmj6PrjRqDq77KPKbPx
-						RB9tOY2O5VnNhWdtDvc7ZC/9ZUYUW5vLOVKm/DjwkOdKGZpz/gwWWqaPhZgySpUw
-						nYYvot+cW/PRaBjWlQIDAQABo3cwdTAdBgNVHQ4EFgQUNl2xUBbzKnp2sitJT4KI
-						1WrGLVkwVAYDVR0RBE0wS4IYaWRwNC5sb25kb25saWJyYXJ5LmNvLnVrhi9odHRw
-						czovL2lkcDQubG9uZG9ubGlicmFyeS5jby51ay9pZHAvc2hpYmJvbGV0aDANBgkq
-						hkiG9w0BAQsFAAOCAQEAZ/eSdTOlLZ8Bwn3nnqtRONJla2FeMjVZgPmDWO5N1oRi
-						a50aDAG1zRAAO4SiPhRBaz4LVIkK35n57A2cZJuafJ1WESFlGMEOXAht+j8FOq8J
-						mlX3Z+QgafmTH/objfdwZ5tODP8WWYCmRwfiS3AlCcTGGECkpeqQ9TRMZ5gkWEmw
-						JFSESbYTyhI+KZ6k7nnSLdasA/L6bL4ZFoNoEYMydD3hpL7r35jq0chcUDbkf4Aj
-						4qbYYT12W7Zlj6FCwl1Xzz/7+OpSlG1xutclWkPnjclasTdKLGJUjpxekePpbtXa
-						VITnAykYlAMJ69EX9lvbTqH9sTTAQpFLjOVwMGlWsQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIVANU4ahFCyREJu8AncXjGLDT0D6P3MA0GCSqGSIb3DQEB
 						CwUAMCMxITAfBgNVBAMMGGlkcDQubG9uZG9ubGlicmFyeS5jby51azAeFw0xNTEy
 						MjMxNDM2MzVaFw0zNTEyMjMxNDM2MzVaMCMxITAfBgNVBAMMGGlkcDQubG9uZG9u
diff --git a/swamid-interfederations-2.0/idpglyndwr.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idpglyndwr.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..19e8384e
--- /dev/null
+++ b/swamid-interfederations-2.0/idpglyndwr.ac.uk-shibboleth.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpglyndwr.ac.uk/shibboleth">
+  <!--
+		This is an IdP (owned by Eduserv) for Glyndwr University.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-09T15:51:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <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">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glyndwr.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
+						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
+						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
+						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
+						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
+						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
+						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
+						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
+						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
+						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
+						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
+						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
+						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
+						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
+						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
+						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
+						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
+						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
+						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
+						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
+						NE4=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/glyndwr.ac.uk/c/ukfed"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/glyndwr.ac.uk/c/ukfed"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Glyndwr University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.glyndwr.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Athens Helpdesk</GivenName>
+    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Athens Helpdesk</GivenName>
+    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml
index 58dcbd87..6c39d1e8 100644
--- a/swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml
@@ -7,11 +7,11 @@
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth: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">int-evry.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-sudparis.eu</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-em.eu</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-sudparis.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-sudparis.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">int-evry.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tem-tsp.eu</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Telecom School of Management and Telecom SudParis</mdui:DisplayName>
         <mdui:InformationURL xml:lang="fr">http://www.tem-tsp.eu</mdui:InformationURL>
@@ -79,11 +79,11 @@ SA354+sPezlzSyImVbYaHH6naLQuFV7cmUNPOQ==
   </md:IDPSSODescriptor>
   <md: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">int-evry.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-sudparis.eu</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-em.eu</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-sudparis.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-sudparis.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">int-evry.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tem-tsp.eu</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/idpv3.lu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idpv3.lu.se-idp-shibboleth.xml
new file mode 100644
index 00000000..d0dcfe24
--- /dev/null
+++ b/swamid-interfederations-2.0/idpv3.lu.se-idp-shibboleth.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpv3.lu.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:Extensions>
+      <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:Keywords xml:lang="sv">lu lth</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">lu lth</mdui:Keywords>
+        <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:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>lu.se</mdui:DomainHint>
+        <mdui:DomainHint>lth.se</mdui:DomainHint>
+        <mdui:IPHint>130.235.0.0/16</mdui:IPHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUD4RyhLFIuNZ5O77xXaRFLYeZgJAwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLaWRwdjMubHUuc2UwHhcNMTYwMjIyMDc1NDA2WhcNMzYw
+MjIyMDc1NDA2WjAWMRQwEgYDVQQDDAtpZHB2My5sdS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJlUtfZBGTW2+XOD2UgwN/KFkrfoyaDrc/CJ9DnG
+rDjHJjlN2Fey7rB3sexvyM6RfLpxkOX7LKcwKBDq3Rjh0IyGUyEjolPls8vlPORz
+WyLGJ/JkXSRYFnOniQxeqfL2Xjo53Hk0yOFUh6gLiRSxla+EueOHwIeXkXhpTYz5
+K8O7lXwmGhS1+kd4HJZFOB8YOYDqaxMHOvcAJH01Khwe6HB0x/0MQ3LTMF0YusHv
+Ob+WjFNGZs5qX7KJcQLEhrzgBhyFVLdKX024+JREzMB7AhNrysuh+h9tLC0oUVPF
+0y0Xf+L18dCH92UamqR3IOC7k+hytZ6QqMnKIq8whXzrpeECAwEAAaNdMFswHQYD
+VR0OBBYEFFADTOECG3DC6WFR7tlcnx9pcn0oMDoGA1UdEQQzMDGCC2lkcHYzLmx1
+LnNlhiJodHRwczovL2lkcHYzLmx1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQAKSwpkEGkZmQPyB22U3bSWcI/QpZlOzNvWMaGaFvwmI+Vn4GS7
+gaPW03B7Pnk71MaPnWXzbDOWvKVMhtkNJiZNSldPqwqt2RnR7SS+af2XbQDqJS0n
+Wb4jgXaO25MLslWrOIeuUn4nfeO5JrUDialovqlN4Om8rn6JPao4wGEiqts3HeAB
+xCsMdAMr8CrJMoK+1sBIgfIr8nBuIo3SvXAsHd6ts0xYVqgeYM6qPg97qiHytJvU
+RkaCJ5ca0ZutSetcL3mkXdHIl+5S9zhgcs3hOLA6v7Yqsd+lWA8Jqh4wbBXixpGu
+cGOFP9UH1ptYCE+azH3kJ0N00MmrXdZgH323
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAOAJRp4FcZsN0Apk6n6NJRREV+6VMA0GCSqGSIb3DQEB
+CwUAMBYxFDASBgNVBAMMC2lkcHYzLmx1LnNlMB4XDTE2MDIyMjA3NTQwNVoXDTM2
+MDIyMjA3NTQwNVowFjEUMBIGA1UEAwwLaWRwdjMubHUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCrPl5u1sQ/6/O9SZFlQHOIxewNK1HpNe9ZSXp+
+91pIlOLiJb16R5rH4KFLzFr6XEghwyNreduL4NSHwnS208rU0UHGnPFK58e4WSUY
+4P5RJSipDAGY1oIIrL4kBrpM50Gwhyxj42xXTq9evG2RsyyeLaPSJePlLtotPt2o
+41RBvW1vzYNcXb7JgSx8s5px6jdtjm+BtWgZtscFomSqSGWFm3/TLo+gntvG4/xT
+o1K9zlDuqfbHIMjD0t8wI4BYX3Wd7pXYNf6i0oXtOpS/9Khae4/orA9d1+8xadHM
+XID2Jk0OdvfEeuTbs5AlUyDlvQgc5nUZUVRvKwqtSSv8pbZdAgMBAAGjXTBbMB0G
+A1UdDgQWBBSxffHocHR0RA65Wd8uRplMXh4VFzA6BgNVHREEMzAxggtpZHB2My5s
+dS5zZYYiaHR0cHM6Ly9pZHB2My5sdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQsFAAOCAQEARk9ha/w5IQs1qKygFTFsCAWkrpAhnOVMeXWCPG+7yzYliCQv
+XX2shOz7RlQpZT+3uyDSWgJ+Z2xdISsThXbDfnMJnU5bbUXSgUy+CYkXjx8lI5b+
+RoLi7bzycPuGIFcOjUzfZxjM5mDxpVUmGP9e3cnosNUAI0iqt34nQwusx+jRZqOi
+HEa8UnjwOtglHEiRxQwyildnenAuXn37ZEe1n9jLiMAzPRFVxIrnuSyalUSyvGc2
+6c9Aozb+3ozGufmWcuVc6wZeZtGdHYRT3N1uVBN2agzRNrlhcuP/gDDjhFHlFMDs
+4YT1j/q6c6UU7MANv5mTzc3hL5MSrvj4CCpVgA==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUauI49n1u/B9z1f0b/KUMu1vDD3EwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLaWRwdjMubHUuc2UwHhcNMTYwMjIyMDc1NDA1WhcNMzYw
+MjIyMDc1NDA1WjAWMRQwEgYDVQQDDAtpZHB2My5sdS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALNlmrTcOU72uwaA3T0pe1avdrzmjEH+Yq9fhbvz
+Jbm8jorNVJot4nLTwXrE8zubuVyndPNYda69SKFW/H2sdsPl6nXiMQv0p3Izw1Ee
+bz4zwWbvSVu7D9ohvwWR5MtV0a5sGkQW8oylyHMS8mwtp+HPEO66D8NDracxZ7/p
+kRobp16SXnsq/jekkFpph5AHsJjRTsX93vB2eFZ5+g2Yx1JloGHuSxQvkgFUktek
+Xf2i6NZYj1Vgr21woVvO6YoErrqrfjtD5ul/MlWD7V8BNZA1I89huTLBMqbFtT/R
+q3vjkHiFDgzyiOSrH6KwcYWdJuNHVISHOOYJil8Gl2eYj5UCAwEAAaNdMFswHQYD
+VR0OBBYEFAOF0q/Lew4bO5kzUKLTi4sKfi6PMDoGA1UdEQQzMDGCC2lkcHYzLmx1
+LnNlhiJodHRwczovL2lkcHYzLmx1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQCwGnCjGcIYhmoKwhcyHmEI2npMZ0zUMUjLxcpY8OjJFXGDUi9j
+fJlhja02L7O/kiRdVadhlIqpi5g3aNwoNyVxLbriiToDNIIm0ixrBMGWoUj9WYe6
+rA86XwGeATly1iQu9EVWH+nCBYs+MLogsB9qtA/2vd4nCM9jNGe9+PhC+p84l3nK
+2E3SR1RhRynJzC+hpoO5KARTw9ymeeMt4FM8lFXhL3rbUJq/Dl3deU0U6xCzyPDh
+KE7aiSxYsHeCrgDI13bWgb/5xaYBMwJLDYj/KTIrtThku/WU8kDgEZtjcfCWCMiJ
+9rjFqJ/gXzCEj4IVOIWKvE1TswY/c0hymlJ3
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.lu.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.lu.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.lu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv3.lu.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.lu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.lu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lu.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="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/idpv3.rnp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml
new file mode 100644
index 00000000..b05181d3
--- /dev/null
+++ b/swamid-interfederations-2.0/idpv3.rnp.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://idpv3.rnp.br/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                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">IDP V3 - Laerte  RNP Campinas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IDP V3 - Laerte  RNP Campinas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IDP V3 - Laerte  RNP Campinas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IDP V3 - Laerte  RNP Campinas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.rnp.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.rnp.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxMTAvBgNVBAoTKFJOUCAtIFJl
+ZGUgTmFjaW9uYWwgZGUgRW5zaW5vIGUgUGVzcXVpc2ExDDAKBgNVBAsTA0dUSTEt
+MCsGCSqGSIb3DQEJARYebGFlcnRlLmJlbG90dG9AdGVyY2Vpcm8ucm5wLmJyMREw
+DwYDVQQHEwhDYW1waW5hczETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkGA1UEBhMC
+QlIxFTATBgNVBAMTDGlkcHYzLnJucC5icjAeFw0xNjA0MDQxNTAxMzRaFw0xOTA0
+MDQxNTAxMzRaMIG8MTEwLwYDVQQKEyhSTlAgLSBSZWRlIE5hY2lvbmFsIGRlIEVu
+c2lubyBlIFBlc3F1aXNhMQwwCgYDVQQLEwNHVEkxLTArBgkqhkiG9w0BCQEWHmxh
+ZXJ0ZS5iZWxvdHRvQHRlcmNlaXJvLnJucC5icjERMA8GA1UEBxMIQ2FtcGluYXMx
+EzARBgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxpZHB2
+My5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSw9chEqxg
+jyWEbzMawJRqOCSxW6L747AD4Cd2PBDP0kAdUTpLvUds10stn7LJVoe9BGqRbo3i
+FXuD8WgmMS03ADjsdXtQuQcOLPdfdjUpswRMbmrzhwygTqBrwmESpbABz6FsxcLI
+LJYkJIWj03ay0nPSCphwqd/FBbensTqeKyy6f7BMudReOPj93oL6ZOEvadrRx/Ln
+AIa446yMgo4b/BZpxKEwE2taJ+F122ytNW5s5UQVdXcg6t/PU8yqpvt6PUN/IeVy
+ZoQE+1/4a6KglA5HMlL+0RW1pVnF7AnEjuS6DXHlPyqO8FqGRB+Dl0P3yAF2XwTP
+3sXegg/OgoxhAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGwYS5Kaft8IZE1p2sPT
+d1MDRJtkBhonCNoc1HgD4bESl6EaSLLcwH40Ued7eXaoXeurhTFNHqY0dpZcZ1qX
+8z9z1ecqN1J2g5jz3z/g+/Pvc/TGxnHANf5ZyTArGcvCDM6mMFlDa440k/UucwFV
+uH84HDKhKM7WB2d2Lsx+Ok9ae3AtE+Jfs7POvQ8OCCg2K/a+MgD0vIPkrjt0Rvqq
+Cu0TgwLPpqMwaxEqdFhISrmKiQDCUrgSFYa5LdeHeNqYzB6cQAN7LWF1eutgaxyv
+rwzjZkFiGeBWPDwP+z0ujfn5lrTAghRDc3f51qSgar/SybqN6bZxjOZF8EzcMqOI
+BLw=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.rnp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.rnp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpv3.rnp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.rnp.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv3.rnp.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.rnp.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rnp.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxMTAvBgNVBAoTKFJOUCAtIFJl
+ZGUgTmFjaW9uYWwgZGUgRW5zaW5vIGUgUGVzcXVpc2ExDDAKBgNVBAsTA0dUSTEt
+MCsGCSqGSIb3DQEJARYebGFlcnRlLmJlbG90dG9AdGVyY2Vpcm8ucm5wLmJyMREw
+DwYDVQQHEwhDYW1waW5hczETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkGA1UEBhMC
+QlIxFTATBgNVBAMTDGlkcHYzLnJucC5icjAeFw0xNjA0MDQxNTAxMzRaFw0xOTA0
+MDQxNTAxMzRaMIG8MTEwLwYDVQQKEyhSTlAgLSBSZWRlIE5hY2lvbmFsIGRlIEVu
+c2lubyBlIFBlc3F1aXNhMQwwCgYDVQQLEwNHVEkxLTArBgkqhkiG9w0BCQEWHmxh
+ZXJ0ZS5iZWxvdHRvQHRlcmNlaXJvLnJucC5icjERMA8GA1UEBxMIQ2FtcGluYXMx
+EzARBgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxpZHB2
+My5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSw9chEqxg
+jyWEbzMawJRqOCSxW6L747AD4Cd2PBDP0kAdUTpLvUds10stn7LJVoe9BGqRbo3i
+FXuD8WgmMS03ADjsdXtQuQcOLPdfdjUpswRMbmrzhwygTqBrwmESpbABz6FsxcLI
+LJYkJIWj03ay0nPSCphwqd/FBbensTqeKyy6f7BMudReOPj93oL6ZOEvadrRx/Ln
+AIa446yMgo4b/BZpxKEwE2taJ+F122ytNW5s5UQVdXcg6t/PU8yqpvt6PUN/IeVy
+ZoQE+1/4a6KglA5HMlL+0RW1pVnF7AnEjuS6DXHlPyqO8FqGRB+Dl0P3yAF2XwTP
+3sXegg/OgoxhAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGwYS5Kaft8IZE1p2sPT
+d1MDRJtkBhonCNoc1HgD4bESl6EaSLLcwH40Ued7eXaoXeurhTFNHqY0dpZcZ1qX
+8z9z1ecqN1J2g5jz3z/g+/Pvc/TGxnHANf5ZyTArGcvCDM6mMFlDa440k/UucwFV
+uH84HDKhKM7WB2d2Lsx+Ok9ae3AtE+Jfs7POvQ8OCCg2K/a+MgD0vIPkrjt0Rvqq
+Cu0TgwLPpqMwaxEqdFhISrmKiQDCUrgSFYa5LdeHeNqYzB6cQAN7LWF1eutgaxyv
+rwzjZkFiGeBWPDwP+z0ujfn5lrTAghRDc3f51qSgar/SybqN6bZxjOZF8EzcMqOI
+BLw=
+                          
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.rnp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.rnp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IDP V3 - Laerte  RNP Campinas</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IDP V3 - Laerte  RNP Campinas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IDP V3 - Laerte  RNP Campinas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IDP V3 - Laerte  RNP Campinas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rnp.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.rnp.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Laerte F Belotto</md:SurName>
+    <md:EmailAddress>laerte.belotto@terceiro.rnp.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml
index c1585584..fc67778e 100644
--- a/swamid-interfederations-2.0/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -33,11 +33,11 @@
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">IUCC</md:ServiceName>
       <md:ServiceDescription xml:lang="en">Inter University Computational Center</md:ServiceDescription>
-      <md:RequestedAttribute 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="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="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 Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml b/swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml
index 8663bbd7..a2dd52e9 100644
--- a/swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml
+++ b/swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml
@@ -8,7 +8,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0: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://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
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
deleted file mode 100644
index 668c0d8d..00000000
--- a/swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://javasp.test.openathens.net/hello/oa/metadata">
-  <!--
-		This is an OpenAthens test SP for Eduserv.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-21T14:54:26Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <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>
-    </KeyDescriptor>
-    <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>
-    </KeyDescriptor>
-    <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"/>
-    <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"/>
-    <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"/>
-    <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"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv: Test Java SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</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
deleted file mode 100644
index 47195d85..00000000
--- a/swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://journals.heacademy.ac.uk/shibboleth">
-  <!--
-		This is a 'Higher Education Academy' OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-19T12:00:00Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <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>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://journals.heacademy.ac.uk/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://journals.heacademy.ac.uk/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://journals.heacademy.ac.uk/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Higher Education Academy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://journals.heacademy.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>sso-support</GivenName>
-    <EmailAddress>mailto:sso-support@atypon.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>sso-tech</GivenName>
-    <EmailAddress>mailto:sso-tech@atypon.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml b/swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml
index 82b310c7..0c19d8c6 100644
--- a/swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml
+++ b/swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml
@@ -9,7 +9,7 @@
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml
deleted file mode 100644
index 5d550df8..00000000
--- a/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://leedstrinity.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Leeds Trinity University.
-	-->
-  <Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <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">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leedstrinity.ac.uk</shibmd:Scope>
-    </Extensions>
-    <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>
-    </KeyDescriptor>
-    <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>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://laidp.leedstrinity.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laidp.leedstrinity.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Leeds Trinity University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Leeds Trinity University OALA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.leedstrinity.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:Helpdesk@leedstrinity.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Dolan</SurName>
-    <EmailAddress>mailto:R.Dolan@leedstrinity.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Baron</SurName>
-    <EmailAddress>mailto:D.Baron@leedstrinity.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml b/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml
index 7f6cbe48..79a75e0e 100644
--- a/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml
@@ -19,8 +19,8 @@
         <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:Logo xml:lang="sv" height="350" width="146">https://login.du.se/duse-logo-sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="350" width="146">https://login.du.se/duse-logo-en.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">hda du</mdui:Keywords>
         <mdui:Keywords xml:lang="en">hda du</mdui:Keywords>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/login.emerson.edu-idp.xml b/swamid-interfederations-2.0/login.emerson.edu-idp.xml
deleted file mode 100644
index 57d03338..00000000
--- a/swamid-interfederations-2.0/login.emerson.edu-idp.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-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.emerson.edu/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emerson.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Emerson 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>
-MIIEMTCCAxmgAwIBAgIJAKN0/KN2I4U9MA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-VQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVzZXR0czEPMA0GA1UEBwwGQm9zdG9u
-MRgwFgYDVQQKDA9FbWVyc29uIENvbGxlZ2UxHzAdBgNVBAsMFkluZm9ybWF0aW9u
-IFRlY2hub2xvZ3kxGjAYBgNVBAMMEWxvZ2luLmVtZXJzb24uZWR1MR8wHQYJKoZI
-hvcNAQkBFhByb290QGVtZXJzb24uZWR1MB4XDTE0MDQwMjE5NDgwOVoXDTI0MDQw
-MTE5NDgwOVowga4xCzAJBgNVBAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRz
-MQ8wDQYDVQQHDAZCb3N0b24xGDAWBgNVBAoMD0VtZXJzb24gQ29sbGVnZTEfMB0G
-A1UECwwWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEaMBgGA1UEAwwRbG9naW4uZW1l
-cnNvbi5lZHUxHzAdBgkqhkiG9w0BCQEWEHJvb3RAZW1lcnNvbi5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3qJbjTbnDdz4MlwuTXhmzog3R5p47
-5BL7eUX9Q6pj/tM807iaKpXlSgakVnDa38o1+Du/1DGEfZ9MhTE9E4yeztuNbFJV
-O9ScKdk6a6hZDIW1YUnWIZrW9v52usKS5Cqs8bmHUCCcFx8jZWnmaS6c6rWkGxSN
-9Kq6AmzClGXID2jubZcEmGPcFjR4Tg4W6Dche3CTZfLHDYRDXxUZ3qpcNVVhcFSx
-vCkDNr0U9ZGsw1V/kHd9dnGvonhezaJDTiDhUI1xyw/qnQdWsqnrFfMDMmdaRq/O
-nHXJ7X+H6eZ0wvluz4IBt4r07LcXBn7yvZTRlVBdDThol++6XFjWJVuxAgMBAAGj
-UDBOMB0GA1UdDgQWBBT6TymEH+rN7J/JGdpM7JeW+38OhDAfBgNVHSMEGDAWgBT6
-TymEH+rN7J/JGdpM7JeW+38OhDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-A4IBAQCMgG0EPvRcyDfcGnUYJmIgiYV8WVg3gILPUQ5T6tPcHJxgvfIcqFigAgWI
-6A/5rD3m5bVGcj+GfOZ4icDvj5Lftd6uAsu+JTXxGfxMJwoqIozx2hLL73usS21V
-rZRxatE0IT3F2oWz0eytE82OMCfvwBCBk71IkWN0orTTyrbYGZhvxJWVRtxUvfZ+
-LEa73Iu/Zg51/frqYYHoBjsX5rVT3H3rBhJqrlHjLS9Fw2Pay/TxAwp5FPC6zmCK
-XYfrkS9wsWKpmuK5J1Xlup8MqqwguX3zRaIFfYUW1c8bLkP7HCA1YTb7pImqBE8Y
-fRerJbNBdbk8AnS/5GdSLL1oSuHK
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.emerson.edu/saml2/idp/SingleLogoutService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.emerson.edu/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Emerson College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Emerson College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.emerson.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Francis Frain</md:GivenName>
-    <md:EmailAddress>Francis_Frain@emerson.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Bryce Riner</md:GivenName>
-    <md:EmailAddress>bryce_riner@emerson.edu</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
deleted file mode 100644
index 03ef9f34..00000000
--- a/swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?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.idp.eduid.se-idp.xml.xml b/swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.xml
index 4139fce7..7d07bd54 100644
--- a/swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.xml
+++ b/swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.xml
@@ -20,8 +20,8 @@
         <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="120" width="320" xml:lang="sv">https://eduid.se/static/img/ds-eduID-logo-black320x120px.png</mdui:Logo>
-        <mdui:Logo height="120" width="320" xml:lang="en">https://eduid.se/static/img/ds-eduID-logo-black320x120px.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="120" width="320">https://eduid.se/static/img/ds-eduID-logo-black320x120px.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="120" width="320">https://eduid.se/static/img/ds-eduID-logo-black320x120px.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
         <mdui:Keywords xml:lang="sv">eduID+studentIdP</mdui:Keywords>
diff --git a/swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..deefd7b9
--- /dev/null
+++ b/swamid-interfederations-2.0/login.jyu.fi-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://login.jyu.fi/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jyu.fi</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Jyväskylä universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Jyväskyla</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Jyväskylän yliopisto</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDyjCCArICCQC/3Ou0lsl3wzANBgkqhkiG9w0BAQUFADCBpjEgMB4GA1UEChMX
+VW5pdmVyc2l0eSBvZiBKeXZhc2t5bGExKTAnBgNVBAsTIEhha2EgZmVkZXJhdGlv
+biBzZWxmLXNpZ25lZCBjZXJ0MR8wHQYJKoZIhvcNAQkBFhB1c2VyYWRtaW5Aanl1
+LmZpMRIwEAYDVQQHEwlKeXZhc2t5bGExCzAJBgNVBAYTAkZJMRUwEwYDVQQDEwxs
+b2dpbi5qeXUuZmkwHhcNMTMwNDA1MTEyOTQxWhcNMzMwMzMxMTEyOTQxWjCBpjEg
+MB4GA1UEChMXVW5pdmVyc2l0eSBvZiBKeXZhc2t5bGExKTAnBgNVBAsTIEhha2Eg
+ZmVkZXJhdGlvbiBzZWxmLXNpZ25lZCBjZXJ0MR8wHQYJKoZIhvcNAQkBFhB1c2Vy
+YWRtaW5Aanl1LmZpMRIwEAYDVQQHEwlKeXZhc2t5bGExCzAJBgNVBAYTAkZJMRUw
+EwYDVQQDEwxsb2dpbi5qeXUuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQD8Y4Twul9N7kGDhz5oRwEYR4maD7hhDsipJvdQMYM5BTDTh3FGX4KvPFKx
+ytz1YVmtHwMmO/GVp0T1O+p9DDNE7AdyPGJieZlaOaYb6INKg1qNStJ3abmtTa1o
+ZtNFnCSsTl+POeCw4tLBU+EIqK6qHMtWaMJk3Kh66oFYwxhVLkvFQuLAFPp13NS3
+NQp6t6zNZOBEJoJ6WIRtz7YT0RPC0Q0jWK8dJErbcqoyWQXhKhelyOWVl4P+JsqA
+U0UkVh/suKfmm/0VhoqWybfbtXyW983eRbmF7im+5LedpL28vNYRjdYk/Y0jGGC0
+8hqR0kjed9s/V+HFHjpnajmnEfD9AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIEO
+JdYZBrjvzJ4ytg8BqN4rggSSrKinsVdtQ1y9nEx/qpBP3W7PS40WkNdnKA+I2V/6
+zWTagYRZitwFvlinyxmetweYuSSSMlhlaJpGWz/fzJ6o+tDW5CVobSy2ijQen/SM
+QwNNrLA+WptOoM78cnMqm5EcPNAVr3JnxUQ7qUxU0pptTVc+R2Jqq26ASoMfoxDC
+lW022c90W26TOCwiKF0zlCi4pj3K9g1GR17bXoQYEsWw1TT34m5O9J8kQglBoqmP
+ZT98QsABBlU/uI3L0YRvitCKE7hgN4v5OMmlyGOiktQteV93hU+gWyP0gwjSsaT+
+OH7h/C8smWC5jlD+a/0=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.jyu.fi/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.jyu.fi/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.jyu.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jyu.fi</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDyjCCArICCQC/3Ou0lsl3wzANBgkqhkiG9w0BAQUFADCBpjEgMB4GA1UEChMX
+VW5pdmVyc2l0eSBvZiBKeXZhc2t5bGExKTAnBgNVBAsTIEhha2EgZmVkZXJhdGlv
+biBzZWxmLXNpZ25lZCBjZXJ0MR8wHQYJKoZIhvcNAQkBFhB1c2VyYWRtaW5Aanl1
+LmZpMRIwEAYDVQQHEwlKeXZhc2t5bGExCzAJBgNVBAYTAkZJMRUwEwYDVQQDEwxs
+b2dpbi5qeXUuZmkwHhcNMTMwNDA1MTEyOTQxWhcNMzMwMzMxMTEyOTQxWjCBpjEg
+MB4GA1UEChMXVW5pdmVyc2l0eSBvZiBKeXZhc2t5bGExKTAnBgNVBAsTIEhha2Eg
+ZmVkZXJhdGlvbiBzZWxmLXNpZ25lZCBjZXJ0MR8wHQYJKoZIhvcNAQkBFhB1c2Vy
+YWRtaW5Aanl1LmZpMRIwEAYDVQQHEwlKeXZhc2t5bGExCzAJBgNVBAYTAkZJMRUw
+EwYDVQQDEwxsb2dpbi5qeXUuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQD8Y4Twul9N7kGDhz5oRwEYR4maD7hhDsipJvdQMYM5BTDTh3FGX4KvPFKx
+ytz1YVmtHwMmO/GVp0T1O+p9DDNE7AdyPGJieZlaOaYb6INKg1qNStJ3abmtTa1o
+ZtNFnCSsTl+POeCw4tLBU+EIqK6qHMtWaMJk3Kh66oFYwxhVLkvFQuLAFPp13NS3
+NQp6t6zNZOBEJoJ6WIRtz7YT0RPC0Q0jWK8dJErbcqoyWQXhKhelyOWVl4P+JsqA
+U0UkVh/suKfmm/0VhoqWybfbtXyW983eRbmF7im+5LedpL28vNYRjdYk/Y0jGGC0
+8hqR0kjed9s/V+HFHjpnajmnEfD9AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIEO
+JdYZBrjvzJ4ytg8BqN4rggSSrKinsVdtQ1y9nEx/qpBP3W7PS40WkNdnKA+I2V/6
+zWTagYRZitwFvlinyxmetweYuSSSMlhlaJpGWz/fzJ6o+tDW5CVobSy2ijQen/SM
+QwNNrLA+WptOoM78cnMqm5EcPNAVr3JnxUQ7qUxU0pptTVc+R2Jqq26ASoMfoxDC
+lW022c90W26TOCwiKF0zlCi4pj3K9g1GR17bXoQYEsWw1TT34m5O9J8kQglBoqmP
+ZT98QsABBlU/uI3L0YRvitCKE7hgN4v5OMmlyGOiktQteV93hU+gWyP0gwjSsaT+
+OH7h/C8smWC5jlD+a/0=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.jyu.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.jyu.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Jyväskylän yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Jyväskyla</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Jyväskylä universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Jyväskylän yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Jyväskyla</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Jyväskylä universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.jyu.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.jyu.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.jyu.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pasi</md:GivenName>
+    <md:SurName>Haapalo</md:SurName>
+    <md:EmailAddress>mailto:useradmin@jyu.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml
index e77f1d5b..68a3a4ad 100644
--- a/swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml
@@ -17,10 +17,10 @@
         <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 height="88" width="80" xml:lang="en">https://tinklas.ktu.lt/images/logo/ktu_80x88.png</mdui:Logo>
-        <mdui:Logo height="88" width="80" xml:lang="lt">https://tinklas.ktu.lt/images/logo/ktu_80x88.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://tinklas.ktu.lt/images/logo/ktu_16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="lt">https://tinklas.ktu.lt/images/logo/ktu_16x16.png</mdui:Logo>
+        <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>
diff --git a/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml
index fd98f37f..87c9a454 100644
--- a/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml
@@ -16,8 +16,8 @@
         <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:Logo xml:lang="sv" height="68" width="350">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="68" width="350">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">liu linkopings+universitet linkoping+university</mdui:Keywords>
         <mdui:Keywords xml:lang="en">liu linkopings+universitet linkoping+university</mdui:Keywords>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/login.offcampuspartners.com.xml b/swamid-interfederations-2.0/login.offcampuspartners.com.xml
index c1740d16..47cd8c8e 100644
--- a/swamid-interfederations-2.0/login.offcampuspartners.com.xml
+++ b/swamid-interfederations-2.0/login.offcampuspartners.com.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.offcampuspartners.com">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2016-02-02T06:43:00Z"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2016-02-02T11:43:00Z"/>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Off Campus Partners</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Off Campus Partners simplifies the off-campus housing&#13;
-   search process for universities, property managers, and students. Our&#13;
-   software platform powers the off-campus housing listing service at the&#13;
-   nation's leading universities.</mdui:Description>
+        <mdui:Description xml:lang="en">Off Campus Partners simplifies the off-campus housing search process for universities, property managers, and students. Our software platform powers the off-campus housing listing service at the nation's leading universities.</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://www.offcampuspartners.com</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://offcampuspartners.com/privacy-policy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml
index 54ec3b2f..a9036085 100644
--- a/swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml
@@ -4,13 +4,18 @@
     <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oulu.fi</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fi">Oulun yliopisto</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Uleåborgs universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Oulun yliopisto</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Oulu</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
diff --git a/swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
index dc296b05..7625e144 100644
--- a/swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
@@ -16,7 +16,7 @@
         <mdui:Description xml:lang="fr">Fournisseur d'Identité pour utilisateurs avec un compte de la Fondation RESTENA</mdui:Description>
         <mdui:Description xml:lang="de">Identitätsprovider für Nutzer mit einem Benutzerkonto bei der Stiftung RESTENA</mdui:Description>
         <mdui:Keywords xml:lang="en">RESTENA user users login education</mdui:Keywords>
-        <mdui:Logo height="100" width="78" xml:lang="en">http://login.restena.lu/restena.png</mdui:Logo>
+        <mdui:Logo width="78" height="100" xml:lang="en">http://login.restena.lu/restena.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:IPHint>158.64.0.0/16</mdui:IPHint>
diff --git a/swamid-interfederations-2.0/login.sonoma.edu-shibboleth.xml b/swamid-interfederations-2.0/login.sonoma.edu-shibboleth.xml
index 6fdc530a..be19206a 100644
--- a/swamid-interfederations-2.0/login.sonoma.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.sonoma.edu-shibboleth.xml
@@ -55,14 +55,6 @@ xAsmDU5SmtNXeA==
     <md:OrganizationDisplayName xml:lang="en">Sonoma State University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.sonoma.edu/</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Eric Eisenhart</md:GivenName>
-    <md:EmailAddress>eric.eisenhart@sonoma.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Brian Biggs</md:GivenName>
-    <md:EmailAddress>brian.biggs@sonoma.edu</md:EmailAddress>
-  </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Geoff Cirullo</md:GivenName>
     <md:EmailAddress>cirullo@sonoma.edu</md:EmailAddress>
@@ -76,7 +68,7 @@ xAsmDU5SmtNXeA==
     <md:EmailAddress>helpdesk@sonoma.edu</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Mike Nelson</md:GivenName>
-    <md:EmailAddress>mike.nelson@sonoma.edu</md:EmailAddress>
+    <md:GivenName>IDP Administrator</md:GivenName>
+    <md:EmailAddress>idp-admin@sonoma.edu</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml b/swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml
new file mode 100644
index 00000000..408b7859
--- /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/jCCAuYCAQAwDQYJKoZIhvcNAQEFBQAwgcQxMjAwBgNVBAoTKVVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMQwwCgYDVQQLEwNDUEQx
+JzAlBgkqhkiG9w0BCQEWGHJ1aS5yaWJlaXJvQGNwZC51ZnJncy5icjEVMBMGA1UE
+BxMMUG9ydG8gQWxlZ3JlMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkG
+A1UEBhMCQlIxFzAVBgNVBAMTDmxvZ2luLnVmcmdzLmJyMB4XDTE2MDMyMzIxMzcz
+OVoXDTE5MDMyMzIxMzczOVowgcQxMjAwBgNVBAoTKVVuaXZlcnNpZGFkZSBGZWRl
+cmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMQwwCgYDVQQLEwNDUEQxJzAlBgkqhkiG
+9w0BCQEWGHJ1aS5yaWJlaXJvQGNwZC51ZnJncy5icjEVMBMGA1UEBxMMUG9ydG8g
+QWxlZ3JlMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIx
+FzAVBgNVBAMTDmxvZ2luLnVmcmdzLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA28lpEXWrRpcro36kwHsH8A+1kugDsTrAOiGi0GGa5rps1/SRrM3x
+vYJ1BB3qRe1npWsJ125uYZ6lj0EyOE/5yGMfpryKfq0fhsXE4UIlih08Qr+52AUw
+F1aZZPrSmrTg+0milZ7fWO4iiivtDANiEaFNlDP11ypNuoEjRlv5NFbf6NwcwIlx
+W0plyz06eUjXP/9wr0BX1cdkd7EJRj+IjYWIp6OeMy1j/1MNp7iwrCBJgY6aW2Ir
+MTshZU9vrjAG2r04fksEkp3yHAXEYKnFA1BPdNz6E2GPHCzIQi17PlhrIRFnxy4E
+SfaNDsPDbPeI5FvKmJAHMIFOO0tHpaND+QIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQBnKJ9c4Rhroc5I7TM1THvQh65JIynlnXjW3Y8xvq213mpHj9N40KANXZ/nzIKC
+hrxmuFJzQ58ylEq5OHy8yylPp8vGOqv7ATpckbh5wiTtfO6SYyX7dPdApxSXBQ6T
+E5pd4xhILcoBmaM3BhF/g/sBJbpXetKnsAYIQ4dANJI1l/xcOdPCB7qppkgEvrRP
+h6eGFBJcSELUyVd+D4NE5H0m7SkuOkSkqg+3XcljYfjJbMFNLqcTJdE77RKpKggW
+vRvJ63diY18yTbcJJbacsuwUnY8tgbnWaxgHtZzaHBiJqJIh7vZLAoQxyUMoENof
+d/IbBMgj8Fg+rkrDM0GRRlHh
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufrgs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufrgs.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.ufrgs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ufrgs.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ufrgs.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ufrgs.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufrgs.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                 
+MIID/jCCAuYCAQAwDQYJKoZIhvcNAQEFBQAwgcQxMjAwBgNVBAoTKVVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMQwwCgYDVQQLEwNDUEQx
+JzAlBgkqhkiG9w0BCQEWGHJ1aS5yaWJlaXJvQGNwZC51ZnJncy5icjEVMBMGA1UE
+BxMMUG9ydG8gQWxlZ3JlMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkG
+A1UEBhMCQlIxFzAVBgNVBAMTDmxvZ2luLnVmcmdzLmJyMB4XDTE2MDMyMzIxMzcz
+OVoXDTE5MDMyMzIxMzczOVowgcQxMjAwBgNVBAoTKVVuaXZlcnNpZGFkZSBGZWRl
+cmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMQwwCgYDVQQLEwNDUEQxJzAlBgkqhkiG
+9w0BCQEWGHJ1aS5yaWJlaXJvQGNwZC51ZnJncy5icjEVMBMGA1UEBxMMUG9ydG8g
+QWxlZ3JlMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIx
+FzAVBgNVBAMTDmxvZ2luLnVmcmdzLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA28lpEXWrRpcro36kwHsH8A+1kugDsTrAOiGi0GGa5rps1/SRrM3x
+vYJ1BB3qRe1npWsJ125uYZ6lj0EyOE/5yGMfpryKfq0fhsXE4UIlih08Qr+52AUw
+F1aZZPrSmrTg+0milZ7fWO4iiivtDANiEaFNlDP11ypNuoEjRlv5NFbf6NwcwIlx
+W0plyz06eUjXP/9wr0BX1cdkd7EJRj+IjYWIp6OeMy1j/1MNp7iwrCBJgY6aW2Ir
+MTshZU9vrjAG2r04fksEkp3yHAXEYKnFA1BPdNz6E2GPHCzIQi17PlhrIRFnxy4E
+SfaNDsPDbPeI5FvKmJAHMIFOO0tHpaND+QIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQBnKJ9c4Rhroc5I7TM1THvQh65JIynlnXjW3Y8xvq213mpHj9N40KANXZ/nzIKC
+hrxmuFJzQ58ylEq5OHy8yylPp8vGOqv7ATpckbh5wiTtfO6SYyX7dPdApxSXBQ6T
+E5pd4xhILcoBmaM3BhF/g/sBJbpXetKnsAYIQ4dANJI1l/xcOdPCB7qppkgEvrRP
+h6eGFBJcSELUyVd+D4NE5H0m7SkuOkSkqg+3XcljYfjJbMFNLqcTJdE77RKpKggW
+vRvJ63diY18yTbcJJbacsuwUnY8tgbnWaxgHtZzaHBiJqJIh7vZLAoQxyUMoENof
+d/IbBMgj8Fg+rkrDM0GRRlHh
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufrgs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufrgs.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufrgs.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufrgs.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Everton Foscarini</md:SurName>
+    <md:EmailAddress>foscarini@cpd.ufrgs.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml b/swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml
index cc073ae1..04ad98e5 100644
--- a/swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml
+++ b/swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml
@@ -16,9 +16,9 @@
         <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 height="100" width="100">https://login.utenos-kolegija.lt/static/logo_100.png</mdui:Logo>
-        <mdui:Logo height="256" width="256">https://login.utenos-kolegija.lt/static/logo_256.png</mdui:Logo>
-        <mdui:Logo height="512" width="512">https://login.utenos-kolegija.lt/static/logo_512.png</mdui:Logo>
+        <mdui:Logo width="100" height="100">https://login.utenos-kolegija.lt/static/logo_100.png</mdui:Logo>
+        <mdui:Logo width="256" height="256">https://login.utenos-kolegija.lt/static/logo_256.png</mdui:Logo>
+        <mdui:Logo width="512" height="512">https://login.utenos-kolegija.lt/static/logo_512.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:IPHint>193.219.181.176/28</mdui:IPHint>
diff --git a/swamid-interfederations-2.0/login.vu.lt-SSO-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.vu.lt-SSO-saml2-idp-metadata.php.xml
index 886f144d..c4f824ce 100644
--- a/swamid-interfederations-2.0/login.vu.lt-SSO-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/login.vu.lt-SSO-saml2-idp-metadata.php.xml
@@ -17,7 +17,7 @@
         <mdui:InformationURL xml:lang="lt">http://www.vu.lt</mdui:InformationURL>
         <mdui:Keywords xml:lang="en">Vilnius Vilnius+University</mdui:Keywords>
         <mdui:Keywords xml:lang="lt">Vilnius Vilniaus+universitetas</mdui:Keywords>
-        <mdui:Logo height="73" width="66">https://www.ittc.vu.lt/images/vu_logo.jpg</mdui:Logo>
+        <mdui:Logo width="66" height="73">https://www.ittc.vu.lt/images/vu_logo.jpg</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml b/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml
index 7ed7916c..1a2d7abb 100644
--- a/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml
+++ b/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml
@@ -117,9 +117,9 @@ ZUhgs9OPjysee18xEBIstkff54Mlz6IKUzpjhorRIR335+M63Qk7WkwGFt3CAW5C
       <md:ServiceDescription xml:lang="fr">EHESS - FMSH - Eduspot site France</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">EHESS - FMSH - Eduspot site France</md:ServiceDescription>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml
index 3b76145c..f968e90a 100644
--- a/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml
@@ -27,39 +27,26 @@
       <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==
+						MIIDADCCAeigAwIBAgIJAKmQG07LbtaqMA0GCSqGSIb3DQEBCwUAMB4xHDAaBgNV
+						BAMTE21lZ3N2bGUubGJvcm8uYWMudWswHhcNMTYwNDA0MTExNTUyWhcNMzYwMzMw
+						MTExNTUyWjAeMRwwGgYDVQQDExNtZWdzdmxlLmxib3JvLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAptjXGVg/C5ZS9ERqejcesxpxi4uQhbUj
+						1c4FUEAiENR7zsQkDYK8Vo8yDPpXgSNLMToJs8pKoeQz80LrwNzWm9XP4AX/nykM
+						2I3M2PWvwyKwjyaIaygDbP9BTKgwTtkEdiwRaRN0uFJ+ltTuTwplgQOGOJoaA/HB
+						PuUHWKmPL3LWDe0aJQaF7H8YxixTfpxawCaUkAXAEuqWWWByCAertQDUln4vs9S4
+						+VXOAKOzpWL5hrMRdJjdy5y6YHVWg/Ma1RbLkSthu9hx6lvXCSQDJOzUXoZDy5Ji
+						sE4DrVPG4zOnuzl7weNExxrv13lSKSH9h1eMcVFoDUcKFSNaNEVqVQIDAQABo0Ew
+						PzAeBgNVHREEFzAVghNtZWdzdmxlLmxib3JvLmFjLnVrMB0GA1UdDgQWBBTCPyOF
+						UDxTQSUtw8+J6tsOJb49HDANBgkqhkiG9w0BAQsFAAOCAQEAEFYXAjJdWbzSf7cv
+						8gNRMwSGPLy2azfxjzsBf+QybIi21BdEbknxkL6JijWn/gFADqmBFUxjZGn5j72O
+						L8NAY3VYPrHsS6xGMMxfZ/A5xzx71y1t22SxtaZW88u2tg3gXGP9s0NssgvXLMdG
+						5MCMW8oZpJzoIcAQbTlTh8zsLov2bPFizopLrRN857Oj7C38XLwPa3LbLu6ZXz2K
+						ly7fE4j2AcivJSHoupjyFVRqWmdtkcMmCGuIlW6BL+CxFgPNCKAFWZxRRMXiuzIz
+						e6RNURI8NnCwzWQ39rJfK3ylKKvFkCKgdFqu1PgQ+Y6XaWM9lqM2EYfi3HYUVMbf
+						iqd+jw==
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SLO/SOAP"/>
diff --git a/swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml
index c91f0d0f..b61a0ee4 100644
--- a/swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -3,7 +3,7 @@
   <md:Extensions>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
diff --git a/swamid-interfederations-2.0/mp.uu.se-Shibboleth.sso.xml b/swamid-interfederations-2.0/mp.uu.se-Shibboleth.sso.xml
index bcaec26a..b2352a66 100644
--- a/swamid-interfederations-2.0/mp.uu.se-Shibboleth.sso.xml
+++ b/swamid-interfederations-2.0/mp.uu.se-Shibboleth.sso.xml
@@ -5,7 +5,7 @@
       <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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
diff --git a/swamid-interfederations-2.0/nhs-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/nhs-shib.hosted.exlibrisgroup.com-shib.xml
new file mode 100644
index 00000000..80ca65de
--- /dev/null
+++ b/swamid-interfederations-2.0/nhs-shib.hosted.exlibrisgroup.com-shib.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nhs-shib.hosted.exlibrisgroup.com/shib">
+  <!--
+		This is a "Cardiff - NHS - Primo" Shibboleth SP for Ex Libris (UK) Limited.
+	-->
+  <Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-24T14:40:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <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://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cardiff - NHS - Primo</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC3DCCAcSgAwIBAgIJAKcM8Bu1ZURlMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB2FpbzAwMjkwHhcNMTUwNDAyMTkyMzI3WhcNMjUwMzMwMTkyMzI3WjASMRAw
+						DgYDVQQDEwdhaW8wMDI5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						p9TB2B6ZVcE0YXR+6D+OaMqqF1NRHYWMQb+tVAf3wIz9VlTyKGuEcq3qs8kudbc8
+						XfgR4C9fklmDeP356bFkPJEv2mLlNlLTwytcsjC3h+Lkg5YdQ1k7BRhZBd7AonZA
+						V5wo5oqjug3MJaSKqeWW/ixf++u8OjmY4phwvcxyFTKlyMzBU/gWj392GKVJadZK
+						4daAKFszh0a/M5Oxh59Npax08GLp3LDqnAYMCI8TSjY2+7qJzcMPkOyS2x1C5Wn/
+						P475YDhN4/0BKcdbZVO44m6c+dsH7eNvmufWpxKzLZqBQ1oUFIIpaDb2yLXH4izt
+						wZslyX/4dquLe6NSK7UFPwIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDI5MB0G
+						A1UdDgQWBBRrShcAeaU6zh2MSQQFy6m90evNQTANBgkqhkiG9w0BAQUFAAOCAQEA
+						A9yiTshpLhPQp9qICL1S6LXCtT0DR7EyvEnw7EsIrX5o4j7bpFe6ZVvp903LtXld
+						2fHtqsndLHeaRyn26JWT+7uJ8oYQgREecGP+ruHRo2slTjk5Iyn2/C1d5+1egAgR
+						EJ22wmfiVA6c2BIzCDYgRZ+revX9LIjaPuKXxDFVWJPGecJjOXXszHe907wd6HNp
+						HWo35M04rRkchlPmc/Xzcb+oPqBNas3/5uINUWRqbWKfyvQ2NodO9Pc6aDQ07Tux
+						OqPrbuYFYgPfLjGriXZYQRplICtMyCzzOMhYCdfJ1ic5/HOBikOTFjMgPHht3Mq+
+						dyeKZ7Et4QKnh9FjfMCOCg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Cardiff - NHS - Primo</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Benoit</GivenName>
+    <SurName>Ginestet</SurName>
+    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Benoit</GivenName>
+    <SurName>Ginestet</SurName>
+    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml
index 0de8d903..b14aa6a6 100644
--- a/swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml
@@ -30,10 +30,10 @@
         <ds:KeyName>noec.aai.niif.hu</ds:KeyName>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/Artifact"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/Redirect"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/ECP" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/POST" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
diff --git a/swamid-interfederations-2.0/oa.kluwerlawonline.com-oa-metadata.xml b/swamid-interfederations-2.0/oa.kluwerlawonline.com-oa-metadata.xml
new file mode 100644
index 00000000..434dcc24
--- /dev/null
+++ b/swamid-interfederations-2.0/oa.kluwerlawonline.com-oa-metadata.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oa.kluwerlawonline.com/oa/metadata">
+  <!--
+		This is a "KluwerLawOnline" OpenAthens SP for Kluwer Law International BV.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-23T10:48:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">KluwerLawOnline</mdui:DisplayName>
+        <mdui:Description xml:lang="en">With an online subscription to Kluwer Law Online, 
+		you gain access to the pdfs and bibliographical information of any of the journals and manuals.
+		</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+			MIIDnTCCAoWgAwIBAgIJAJYLHg2fH267MA0GCSqGSIb3DQEBBQUAMD0xGjAYBgNV
+			BAoTEUtsdXdlciBMYXcgT25saW5lMR8wHQYDVQQDExZvYS5rbHV3ZXJsYXdvbmxp
+			bmUuY29tMB4XDTE1MDczMTE2NDkwNloXDTI1MDcyODE2NDkwNlowPTEaMBgGA1UE
+			ChMRS2x1d2VyIExhdyBPbmxpbmUxHzAdBgNVBAMTFm9hLmtsdXdlcmxhd29ubGlu
+			ZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCUcpIkgmhzB1g+
+			+eTVTnyKWRgs+/mSDUPw7FrYtCPiDYEBmenr609GD6vZYCbvHRLqYY10jEo/Nyq7
+			vP1XF6kyoBcFa/dANKGuAq8l0ZB18HiU85BvwRKfpf27A/UOq3cMHBQnZsRs/aT4
+			QRgOulKMu5wrPRzH6r5Zs8L0LRo+sGcP0cn4/R6sdCtZ5/VX3KvuDHLTuWkVFmAn
+			0fJjFJ+DXkc64llNWbZkbcOHucN9bOkBfwwSL4DQDp6oQCDfMCxD/FnNinvN8CUC
+			4JphqnjgYynnTceN9MYZt0AOJamOCaQVAJIP9oKpydgb/FHp+FQAa3ro6lqg5l5C
+			69155ppJAgMBAAGjgZ8wgZwwHQYDVR0OBBYEFO67+5bmuAYHPlYPyZyRX6FZs8f/
+			MG0GA1UdIwRmMGSAFO67+5bmuAYHPlYPyZyRX6FZs8f/oUGkPzA9MRowGAYDVQQK
+			ExFLbHV3ZXIgTGF3IE9ubGluZTEfMB0GA1UEAxMWb2Eua2x1d2VybGF3b25saW5l
+			LmNvbYIJAJYLHg2fH267MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+			ADAaSYwEwCQZ4OapKHSIX9p3Ia7/ALFx/p1D6dJjltSNuE114ql4NfouR7DisgIb
+			I61dtVM/fzjYeypmkLcbX2bqI+nQNbKPyjkmnW8nKIQuM7fPwy0kQwV9LlOe8aco
+			nx4zVpkZST/aJhsbBF/PXVHKLuoTKe+E3pwqlvrtxSWVKYY4V+cFWzDMtZN79AMF
+			VwJ5T9KvixVnSnw5UnEUZGtxDBeYnTEIq7uQnObdkSMWWF8SxUNJusb6eK7PFL77
+			S4Xmt02YQb+KgWfOlxUJYTdPVwTWgl1mG+bJtMGhm+Fhvbe6XsE9OTkR3JukWM09
+			EdleBJR5tYeTchiSmuPV+fU=
+		</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+			MIIDnTCCAoWgAwIBAgIJAJYLHg2fH267MA0GCSqGSIb3DQEBBQUAMD0xGjAYBgNV
+			BAoTEUtsdXdlciBMYXcgT25saW5lMR8wHQYDVQQDExZvYS5rbHV3ZXJsYXdvbmxp
+			bmUuY29tMB4XDTE1MDczMTE2NDkwNloXDTI1MDcyODE2NDkwNlowPTEaMBgGA1UE
+			ChMRS2x1d2VyIExhdyBPbmxpbmUxHzAdBgNVBAMTFm9hLmtsdXdlcmxhd29ubGlu
+			ZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCUcpIkgmhzB1g+
+			+eTVTnyKWRgs+/mSDUPw7FrYtCPiDYEBmenr609GD6vZYCbvHRLqYY10jEo/Nyq7
+			vP1XF6kyoBcFa/dANKGuAq8l0ZB18HiU85BvwRKfpf27A/UOq3cMHBQnZsRs/aT4
+			QRgOulKMu5wrPRzH6r5Zs8L0LRo+sGcP0cn4/R6sdCtZ5/VX3KvuDHLTuWkVFmAn
+			0fJjFJ+DXkc64llNWbZkbcOHucN9bOkBfwwSL4DQDp6oQCDfMCxD/FnNinvN8CUC
+			4JphqnjgYynnTceN9MYZt0AOJamOCaQVAJIP9oKpydgb/FHp+FQAa3ro6lqg5l5C
+			69155ppJAgMBAAGjgZ8wgZwwHQYDVR0OBBYEFO67+5bmuAYHPlYPyZyRX6FZs8f/
+			MG0GA1UdIwRmMGSAFO67+5bmuAYHPlYPyZyRX6FZs8f/oUGkPzA9MRowGAYDVQQK
+			ExFLbHV3ZXIgTGF3IE9ubGluZTEfMB0GA1UEAxMWb2Eua2x1d2VybGF3b25saW5l
+			LmNvbYIJAJYLHg2fH267MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+			ADAaSYwEwCQZ4OapKHSIX9p3Ia7/ALFx/p1D6dJjltSNuE114ql4NfouR7DisgIb
+			I61dtVM/fzjYeypmkLcbX2bqI+nQNbKPyjkmnW8nKIQuM7fPwy0kQwV9LlOe8aco
+			nx4zVpkZST/aJhsbBF/PXVHKLuoTKe+E3pwqlvrtxSWVKYY4V+cFWzDMtZN79AMF
+			VwJ5T9KvixVnSnw5UnEUZGtxDBeYnTEIq7uQnObdkSMWWF8SxUNJusb6eK7PFL77
+			S4Xmt02YQb+KgWfOlxUJYTdPVwTWgl1mG+bJtMGhm+Fhvbe6XsE9OTkR3JukWM09
+			EdleBJR5tYeTchiSmuPV+fU=
+		</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oa.kluwerlawonline.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oa.kluwerlawonline.com/oa/auth/rcv/saml2/post" index="2"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Kluwer Law International BV</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">KluwerLawOnline</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.kluwerlawonline.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Kirsten</GivenName>
+    <SurName>van Engelenburg</SurName>
+    <EmailAddress>mailto:kirsten.vanengelenburg@wolterskluwer.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Kirsten</GivenName>
+    <SurName>van Engelenburg</SurName>
+    <EmailAddress>mailto:kirsten.vanengelenburg@wolterskluwer.com</EmailAddress>
+  </ContactPerson>
+</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
deleted file mode 100644
index ead6de6c..00000000
--- a/swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oasp.test.openathens.net/oa/metadata">
-  <!--
-		This is an OpenAthens test SP for Eduserv.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-21T14:55:47Z"/>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <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>
-    </KeyDescriptor>
-    <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>
-    </KeyDescriptor>
-    <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"/>
-    <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"/>
-    <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"/>
-    <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"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv: Test C SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</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
deleted file mode 100644
index bd49a069..00000000
--- a/swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathenstest1.test.openathens.net/oa/metadata">
-  <!--
-		This is an OpenAthens Support Test SP for Eduserv.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-02T14:42:55Z"/>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <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>
-    </KeyDescriptor>
-    <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>
-    </KeyDescriptor>
-    <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"/>
-    <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"/>
-    <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"/>
-    <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"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv Open Athens Support Test SP1</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/Identity-Access/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Westhoff</SurName>
-    <EmailAddress>mailto:jw@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Westhoff</SurName>
-    <EmailAddress>mailto:jw@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</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
deleted file mode 100644
index e2f2bd8d..00000000
--- a/swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathenstest2.test.openathens.net/oa/metadata">
-  <!--
-		This is an OpenAthens Support Test SP for Eduserv.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-02T14:50:35Z"/>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <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>
-    </KeyDescriptor>
-    <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>
-    </KeyDescriptor>
-    <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"/>
-    <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"/>
-    <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"/>
-    <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"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv Open Athens Support Test SP2</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/Identity-Access/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Westhoff</SurName>
-    <EmailAddress>mailto:jw@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Westhoff</SurName>
-    <EmailAddress>mailto:jw@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml b/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
index a9abf442..213854bb 100644
--- a/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
+++ b/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
@@ -9,7 +9,7 @@
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/openstack.hbit.sztaki.hu-shibboleth.xml b/swamid-interfederations-2.0/openstack.hbit.sztaki.hu-shibboleth.xml
index 6b8bbf99..457df5e7 100644
--- a/swamid-interfederations-2.0/openstack.hbit.sztaki.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/openstack.hbit.sztaki.hu-shibboleth.xml
@@ -35,7 +35,7 @@
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openstack.hbit.sztaki.hu/Shibboleth.sso/SLO/Redirect"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openstack.hbit.sztaki.hu/Shibboleth.sso/SAML2/POST" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openstack.hbit.sztaki.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openstack.hbit.sztaki.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="hu">Sztaki HBIT OpenStack</md:ServiceName>
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 0d66e714..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
@@ -34,13 +34,13 @@
       <md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
       <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="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="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml b/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml
deleted file mode 100644
index 8e4b52e7..00000000
--- a/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud4elixir.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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="11"/>
-  </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/play.smdb.kb.se.xml b/swamid-interfederations-2.0/play.smdb.kb.se.xml
index 12a56243..6072acbb 100644
--- a/swamid-interfederations-2.0/play.smdb.kb.se.xml
+++ b/swamid-interfederations-2.0/play.smdb.kb.se.xml
@@ -5,7 +5,7 @@
       <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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
       </saml:Attribute>
diff --git a/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml b/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
index 0698ed07..ec17a904 100644
--- a/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
+++ b/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
@@ -9,7 +9,7 @@
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml b/swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml
new file mode 100644
index 00000000..ed8aa550
--- /dev/null
+++ b/swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ppms.eu/manchester/shibboleth">
+  <!--
+		This is a "PPMS for the University of Manchester" Shibboleth SP for Stratocore.
+	-->
+  <Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-07T12:23:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <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://corefacilities.manchester.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="59" width="143">https://ppms.eu/stratocore.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Stratocore PPMS for the University of Manchester</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Stratocore's PPMS core facility management solution for the University of Manchester</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <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>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Stratocore</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Stratocore PPMS for the University of Manchester</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://stratocore.com/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Stratocore Support</GivenName>
+    <EmailAddress>mailto:support@stratocore.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Mathieu</GivenName>
+    <SurName>Marchand</SurName>
+    <EmailAddress>mailto:hosting@stratocore.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml b/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml
index 2f3b5980..77f7a164 100644
--- a/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml
+++ b/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml
@@ -82,12 +82,12 @@ v2pL4O5/2DnqrGVffjSIqLB2
       <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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/prisma.research.se-shibboleth.xml b/swamid-interfederations-2.0/prisma.research.se-shibboleth.xml
index 1db4c077..aa58345b 100644
--- a/swamid-interfederations-2.0/prisma.research.se-shibboleth.xml
+++ b/swamid-interfederations-2.0/prisma.research.se-shibboleth.xml
@@ -21,7 +21,7 @@
     <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
diff --git a/swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml
index 8c80f267..9f5ee83a 100644
--- a/swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml
@@ -89,8 +89,8 @@
     <EmailAddress>mailto:helpdesk@ukdataservice.ac.uk</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Payne</SurName>
-    <EmailAddress>mailto:jmpayne@essex.ac.uk</EmailAddress>
+    <GivenName>Amir</GivenName>
+    <SurName>Moradi</SurName>
+    <EmailAddress>mailto:amoradi@essex.ac.uk</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml b/swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml
index 4f8b5a2c..97ed8d53 100644
--- a/swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml
+++ b/swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml
@@ -72,11 +72,11 @@ zj16Ew8OQzC0oKfgorVh3LhhSqykgsmo4gLR6t3EKTtjWjjZ+tP9pVaN6vINj4lw
       <md:ServiceName xml:lang="en">rendez-vous platform</md:ServiceName>
       <md:ServiceDescription xml:lang="fr">service de visio-conférence Rendez-vous</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Videoconferencing service Rendez-vous</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="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="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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml b/swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml
index 94eeea2f..d3074c17 100644
--- a/swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml
@@ -8,7 +8,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0: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://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
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 b2b702dd..7d27a7ea 100644
--- a/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml
@@ -8,7 +8,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc: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://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml b/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml
index 03f881f5..d4ab16bd 100644
--- a/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml
+++ b/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.edusafe.nordu.net">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2015-06-04T14:43:01Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-04T14:43:01Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:Description xml:lang="da">Formålet er at muliggøre enkel oprettelse og håndtering af VPN'er.</mdui:Description>
@@ -23,7 +23,7 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edusafe.nordu.net/saml/LogoutServiceHTTPRedirect"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edusafe.nordu.net/saml/SAMLAssertionConsumer" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" Location="https://edusafe.nordu.net/saml/SAMLAssertionConsumer"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">eduSAFE</md:ServiceName>
       <md:ServiceName xml:lang="en">eduSAFE</md:ServiceName>
@@ -38,8 +38,7 @@
     <md:OrganizationURL xml:lang="en">http://www.deic.dk/</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:Company>University of Patras</md:Company>
+    <md:EmailAddress>stathopou@ceid.upatras.gr</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml b/swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml
index 1fb105be..cd0ba1bc 100644
--- a/swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml
+++ b/swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://saml.edusafe.qalab.geant.net">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk" registrationInstant="2016-02-24T11:14:58Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2016-02-24T11:14:58Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:Description xml:lang="da">Formålet er at gøre det nemt at forbinde til MDVPN via et softwarebaseret VPN.</mdui:Description>
@@ -23,7 +23,7 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edusafe.psnc.pl/edusafe-portal/saml/LogoutServiceHTTPRedirectResponse"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edusafe.psnc.pl/edusafe-portal/saml/SAMLAssertionConsumer" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" Location="https://edusafe.psnc.pl/edusafe-portal/saml/SAMLAssertionConsumer"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">eduSAFE-MDVPN</md:ServiceName>
       <md:ServiceName xml:lang="en">eduSAFE-MDVPN</md:ServiceName>
@@ -38,8 +38,7 @@
     <md:OrganizationURL xml:lang="en">http://deic.dk</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:Company>PSNC</md:Company>
+    <md:EmailAddress>labedzki@man.poznan.pl</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.lynda.com.xml b/swamid-interfederations-2.0/saml.lynda.com.xml
new file mode 100644
index 00000000..0f61dbc1
--- /dev/null
+++ b/swamid-interfederations-2.0/saml.lynda.com.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://saml.lynda.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-06T14:42:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">lynda.com</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">lynda.com</mdui:DisplayName>
+        <mdui:Description xml:lang="de">lynda.com ist eines der führenden Online-Learning-Unternehmen, das Nutzer dabei unterstützt, persönliche Fähigkeiten im Bereich Business, Software, Technologie und Kreativität zu entwickeln und persönliche und berufliche Ziele besser zu erreichen. Durch Abonnements für Einzelpersonen, Unternehmen, akademische und staatliche Einrichtungen haben Mitglieder Zugang zur lynda.com Videothek mit ansprechenden und hochwertigen Kursen, die von anerkannten Industrie-Experten unterrichtet werden. Das Unternehmen bietet auch Inhalte auf Deutsch, Französisch und Spanisch unter dem Markennamen video2brain an.</mdui:Description>
+        <mdui:Description xml:lang="en">lynda.com is a leading online learning company that helps anyone learn business, software, technology and creative skills to achieve personal and professional goals. Through individual, corporate, academic and government subscriptions, members have access to the lynda.com video library of engaging, top-quality courses taught by recognized industry experts. The company also provides German, French and Spanish language content under the video2brain brand name.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://saml.lynda.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=https://saml.lynda.com</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDITCCAgmgAwIBAgIJAPS3fySJTyfaMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmh0dHBzOi8vc2FtbC5seW5kYS5jb20wHhcNMTUxMDA1MTcxNTA0WhcNMTgx
+MDA0MTcxNTA0WjAhMR8wHQYDVQQDExZodHRwczovL3NhbWwubHluZGEuY29tMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArljPwyk0t7fUrSYp7IcHBSI1
+29pQXs+eFnLUVvyXZ6X2ESoR1IC25P4ShlrmGHzkXrDY5RMDfZXxOlEQ3Z05gDHb
+LpDO+AxF1mzRZZjCP+XN1lgHeAue+14WRRQ4t55zsrnrwECBwj5A7PBat/8qVbqS
+eKJCfV21bKOeBD2g4nA9f1lJSMnoZ3tzOlysDg2oIbWbYqkX1NvalPO9smdtnsOk
+pb4RgGRx4f2iF5mg348n5s6napEid1578JI4QmEYdY+FMMpCK1xVwfconbKqP7BR
+WZh/JqpZjiem86Tv68LHReSIpySEnDQILDfvOi6n+OpiVwAnbnGrI4Q2OM3DpQID
+AQABo1wwWjA5BgNVHREEMjAwghZodHRwczovL3NhbWwubHluZGEuY29thhZodHRw
+czovL3NhbWwubHluZGEuY29tMB0GA1UdDgQWBBQuFJx7I6SR9oV6iuEqwJPd0mSE
+0jANBgkqhkiG9w0BAQUFAAOCAQEAq9XpSOuF67tPtTB+WKHegyYI0wZ3GoJxjYPz
+vEgv+LYSYutkDJG6M5HDkjtxn+SqIqBTr6AxGYdol8WPICgVAlj1LV36NHtE8TUi
+1gC7gzv/XxVPhLpEsyx2vcOgY/J5Nziu0epPg98GSvmplDG0Z6YuSa/zp7I1Z73r
+3Mu/W8FJJqoSZjil6BPnXv1dbjgOjg8Z7eQjqDwr2ki/td69pvvEyqIQ/0i/5C5w
+0k0LQi2tiJfdQN1LzTP/z7uglW9MXtsgWQgiY1fbMAU5PLdneI0GHwDUYbnizdk2
+YlDBz1PhAHejnP2Sx6tnjNQ36qgiwvybuEhFWs2/jSOM4SWhyg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml.lynda.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.lynda.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml.lynda.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml.lynda.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml.lynda.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://saml.lynda.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">lynda.com</md:ServiceName>
+      <md:ServiceName xml:lang="en">lynda.com</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">lynda.com ist eines der führenden Online-Learning-Unternehmen, das Nutzer dabei unterstützt, persönliche Fähigkeiten im Bereich Business, Software, Technologie und Kreativität zu entwickeln und persönliche und berufliche Ziele besser zu erreichen. Durch Abonnements für Einzelpersonen, Unternehmen, akademische und staatliche Einrichtungen haben Mitglieder Zugang zur lynda.com Videothek mit ansprechenden und hochwertigen Kursen, die von anerkannten Industrie-Experten unterrichtet werden. Das Unternehmen bietet auch Inhalte auf Deutsch, Französisch und Spanisch unter dem Markennamen video2brain an.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">lynda.com is a leading online learning company that helps anyone learn business, software, technology and creative skills to achieve personal and professional goals. Through individual, corporate, academic and government subscriptions, members have access to the lynda.com video library of engaging, top-quality courses taught by recognized industry experts. The company also provides German, French and Spanish language content under the video2brain brand name.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e484</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e484</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">lynda.com, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">lynda.com, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.lynda.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.lynda.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Flynn</md:SurName>
+    <md:EmailAddress>mailto:miflynn@linkedin.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Flynn</md:SurName>
+    <md:EmailAddress>mailto:miflynn@linkedin.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml b/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml
index bc32c713..5b13ceb3 100644
--- a/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml
+++ b/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml
@@ -8,7 +8,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0: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://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml
index 04390510..94fa2fae 100644
--- a/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml
@@ -54,11 +54,11 @@ vcW4oD4N2OIPcMam+7V1yw==
     <md:OrganizationURL xml:lang="en">http://stevenson.edu/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Philip Desrosiers</md:GivenName>
-    <md:EmailAddress>pdesrosiers@stevenson.edu</md:EmailAddress>
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>shibadmin@stevenson.edu</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
-    <md:GivenName>Philip Desrosiers</md:GivenName>
-    <md:EmailAddress>pdesrosiers@stevenson.edu</md:EmailAddress>
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>shibadmin@stevenson.edu</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-staging.data-archive.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-staging.data-archive.ac.uk-idp-shibboleth.xml
index b1f69572..ed7024f4 100644
--- a/swamid-interfederations-2.0/shib-staging.data-archive.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-staging.data-archive.ac.uk-idp-shibboleth.xml
@@ -186,8 +186,8 @@
     <EmailAddress>mailto:jpsexton@essex.ac.uk</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Payne</SurName>
-    <EmailAddress>mailto:jmpayne@essex.ac.uk</EmailAddress>
+    <GivenName>Amir</GivenName>
+    <SurName>Moradi</SurName>
+    <EmailAddress>mailto:amoradi@essex.ac.uk</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml
index d0ba98db..cdca3217 100644
--- a/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml
@@ -90,10 +90,6 @@ D0UPBA==
     <md:OrganizationURL xml:lang="en">http://www.bucknell.edu/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Keelan Cleary</md:GivenName>
-    <md:EmailAddress>cleary@bucknell.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
     <md:GivenName>Michael Dahlberg</md:GivenName>
     <md:EmailAddress>dahlberg@bucknell.edu</md:EmailAddress>
   </md:ContactPerson>
diff --git a/swamid-interfederations-2.0/shib.courseleaf.com-shibboleth.xml b/swamid-interfederations-2.0/shib.courseleaf.com-shibboleth.xml
new file mode 100644
index 00000000..47a436cf
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.courseleaf.com-shibboleth.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.courseleaf.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.courseleaf.com/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CourseLeaf</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Leepfrog Technologies CourseLeaf</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://courseleaf.com</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDDzCCAfegAwIBAgIJALAsCdsphihDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMME3NoaWIuY291cnNlbGVhZi5jb20wHhcNMTQwNDExMTYwMjAxWhcNMjQwNDA4
+MTYwMjAxWjAeMRwwGgYDVQQDDBNzaGliLmNvdXJzZWxlYWYuY29tMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtEXMRZGERUGU/S2fOfjXFCED6+d6k37L
+0p+qnU5lTKz3ry8f1fx8SAfbXUdmJWfnUocAbE6S7ldJr/y2McNqq24T4cMOpexP
+uUjO0QwdFYpl+zxccG9oMkBWvr9RSoaTY08oa7nwEkx1bZ12yq8K6Z1WUe/XaEWG
+Q/OGEQJ9K8TidElZr68PYh2bYYF+qiHBDQkWMqDV8fnb/ljjyIcmZijxJIQ0+FWO
+278UwCY85w3Vi0wMEF7jIrFEwoxf9NGrtJWn1hxaAqesJ5ILZTo3VFgXf52iZRhx
+LWwuxn8opZdA20oFJb0PxJvDfJldFhyacrml3DXkG0l6ysx3lweV9wIDAQABo1Aw
+TjAdBgNVHQ4EFgQUdh5Dd9hJbH8TwgiMchfyh/cYUfcwHwYDVR0jBBgwFoAUdh5D
+d9hJbH8TwgiMchfyh/cYUfcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOC
+AQEAKGLyWTvE6CKxrlJAn/Z90Hp3O4phot0CDKkPZfTF145R523YFDlloJQ5pnMA
+MbPXdQ5Fk5qUzDwtWMW//gW3nSP3XpRnEwOR1EIUOil39wprH1Ny9Bxzb1dQue7i
+QgM1qiBUzw5ZYSzmuC44i6PuyPMresgopm5MRmrsGD3Nw86k2wc5nf0PVIKI7O6F
+EB9avy/o/5Ciu0/Iw/ogixkQoMvtDrh3cC4QdVz4d8OjQzP9xbPMtcWbzJIzf6/O
+EsvIY/ZNwb1RTkT8GIXwkC7EgO0m5UeRMJJWFU1K8Jk9chpCmebrXFcz1RqJBlUE
+jhao0WXgTHHQUUpEzZXrh/Bzyw==
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currbulletin.wustl.edu/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.wustl.edu/Shibboleth.sso/SAML2/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coursecatalog-new.web.cmu.edu/Shibboleth.sso/SAML2/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upcomingcatalog.uchicago.edu/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stagingcatalog.uchicago.edu/Shibboleth.sso/SAML2/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.odu.edu/Shibboleth.sso/SAML2/POST" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.odu.edu/Shibboleth.sso/SAML2/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next-catalog.ncsu.edu/Shibboleth.sso/SAML2/POST" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current-catalog.ncsu.edu/Shibboleth.sso/SAML2/POST" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exploredegrees-admin.stanford.edu/Shibboleth.sso/SAML2/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exploredegrees-nextyear.stanford.edu/Shibboleth.sso/SAML2/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.brown.edu/Shibboleth.sso/SAML2/POST" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentbulletin.brown.edu/Shibboleth.sso/SAML2/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uark.edu/Shibboleth.sso/SAML2/POST" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uark.edu/Shibboleth.sso/SAML2/POST" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.utexas.edu/Shibboleth.sso/SAML2/POST" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currcatalog.utexas.edu/Shibboleth.sso/SAML2/POST" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalogue.uci.edu/Shibboleth.sso/SAML2/POST" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.catalogue.uci.edu/Shibboleth.sso/SAML2/POST" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog-admin.calpoly.edu/Shibboleth.sso/SAML2/POST" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog-admin.calpoly.edu/Shibboleth.sso/SAML2/POST" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.missouri.edu/Shibboleth.sso/SAML2/POST" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.missouri.edu/Shibboleth.sso/SAML2/POST" index="29"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.umsl.edu/Shibboleth.sso/SAML2/POST" index="30"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentbulletin.umsl.edu/Shibboleth.sso/SAML2/POST" index="31"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.mst.edu/Shibboleth.sso/SAML2/POST" index="32"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.mst.edu/Shibboleth.sso/SAML2/POST" index="33"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.sandburg.edu/Shibboleth.sso/SAML2/POST" index="34"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.sandburg.edu/Shibboleth.sso/SAML2/POST" index="35"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalog.utsa.edu/Shibboleth.sso/SAML2/POST" index="36"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.catalog.utsa.edu/Shibboleth.sso/SAML2/POST" index="37"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog-next.uvm.edu/Shibboleth.sso/SAML2/POST" index="38"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog-current.uvm.edu/Shibboleth.sso/SAML2/POST" index="39"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.lehigh.edu/Shibboleth.sso/SAML2/POST" index="40"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.lehigh.edu/Shibboleth.sso/SAML2/POST" index="41"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://courseadmin.ou.edu/Shibboleth.sso/SAML2/POST" index="42"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uthscsa.edu/Shibboleth.sso/SAML2/POST" index="43"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uthscsa.edu/Shibboleth.sso/SAML2/POST" index="44"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e-nextcatalog.jhu.edu/Shibboleth.sso/SAML2/POST" index="45"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e-currentcatalog.jhu.edu/Shibboleth.sso/SAML2/POST" index="46"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalog.ku.edu/Shibboleth.sso/SAML2/POST" index="47"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.catalog.ku.edu/Shibboleth.sso/SAML2/POST" index="48"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uoregon.edu/Shibboleth.sso/SAML2/POST" index="49"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uoregon.edu/Shibboleth.sso/SAML2/POST" index="50"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uis.edu/Shibboleth.sso/SAML2/POST" index="51"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uis.edu/Shibboleth.sso/SAML2/POST" index="52"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uic.edu/Shibboleth.sso/SAML2/POST" index="53"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uic.edu/Shibboleth.sso/SAML2/POST" index="54"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.bulletin.gwu.edu/Shibboleth.sso/SAML2/POST" index="55"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.bulletin.gwu.edu/Shibboleth.sso/SAML2/POST" index="56"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcourses.illinois.edu/Shibboleth.sso/SAML2/POST" index="57"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcourses.illinois.edu/Shibboleth.sso/SAML2/POST" index="58"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.csusb.edu/Shibboleth.sso/SAML2/POST" index="59"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentbulletin.csusb.edu/Shibboleth.sso/SAML2/POST" index="60"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.apu.edu/Shibboleth.sso/SAML2/POST" index="61"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.apu.edu/Shibboleth.sso/SAML2/POST" index="62"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.umkc.edu/Shibboleth.sso/SAML2/POST" index="63"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://editcatalog.umkc.edu/Shibboleth.sso/SAML2/POST" index="64"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.creighton.edu/Shibboleth.sso/SAML2/POST" index="65"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.creighton.edu/Shibboleth.sso/SAML2/POST" index="66"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://classplanning.northwestern.edu/Shibboleth.sso/SAML2/POST" index="67"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.towson.edu/Shibboleth.sso/SAML2/POST" index="68"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.towson.edu/Shibboleth.sso/SAML2/POST" index="69"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uww-next.courseleaf.com/Shibboleth.sso/SAML2/POST" index="70"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uww-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="71"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalog.njit.edu/Shibboleth.sso/SAML2/POST" index="72"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.catalog.njit.edu/Shibboleth.sso/SAML2/POST" index="73"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://northwestern-dev.courseleaf.com/Shibboleth.sso/SAML2/POST" index="74"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.temple.edu/Shibboleth.sso/SAML2/POST" index="75"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentbulletin.temple.edu/Shibboleth.sso/SAML2/POST" index="76"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalogue.uci.edu/Shibboleth.sso/SAML2/POST" index="77"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.catalogue.uci.edu/Shibboleth.sso/SAML2/POST" index="78"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.mtholyoke.edu/Shibboleth.sso/SAML2/POST" index="79"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.mtholyoke.edu/Shibboleth.sso/SAML2/POST" index="80"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uwgb.edu/Shibboleth.sso/SAML2/POST" index="81"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uwgb.edu/Shibboleth.sso/SAML2/POST" index="82"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.twu.edu/Shibboleth.sso/SAML2/POST" index="83"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.twu.edu/Shibboleth.sso/SAML2/POST" index="84"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.stolaf.edu/Shibboleth.sso/SAML2/POST" index="85"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currcatalog.stolaf.edu/Shibboleth.sso/SAML2/POST" index="86"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalog.colostate.edu/Shibboleth.sso/SAML2/POST" index="87"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog-dev.mit.edu/Shibboleth.sso/SAML2/POST" index="88"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mit-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="89"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://colostate-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="90"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.udayton.edu/Shibboleth.sso/SAML2/POST" index="91"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.udayton.edu/Shibboleth.sso/SAML2/POST" index="92"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://utexas-prior.courseleaf.com/Shibboleth.sso/SAML2/POST" index="93"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uic-prior.courseleaf.com/Shibboleth.sso/SAML2/POST" index="94"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog-test.uwplatt.edu/Shibboleth.sso/SAML2/POST" index="95"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.mycatalog.txstate.edu/Shibboleth.sso/SAML2/POST" index="96"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.mycatalog.txstate.edu/Shibboleth.sso/SAML2/POST" index="97"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next-bulletin.miami.edu/Shibboleth.sso/SAML2/POST" index="98"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miami-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="99"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uah.edu/Shibboleth.sso/SAML2/POST" index="100"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uah-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="101"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextschedule.unomaha.edu/Shibboleth.sso/SAML2/POST" index="102"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.shsu.edu/Shibboleth.sso/SAML2/POST" index="103"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shsu-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="104"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.northeastern.edu/Shibboleth.sso/SAML2/POST" index="105"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://northeastern-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="106"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stanford-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="107"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://easyschedule.fau.edu/Shibboleth.sso/SAML2/POST" index="108"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uci-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="109"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.ou.edu/Shibboleth.sso/SAML2/POST" index="110"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ou-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="111"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unomaha-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="112"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uwec.edu/Shibboleth.sso/SAML2/POST" index="113"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uwec-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="114"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.registrar.iastate.edu/Shibboleth.sso/SAML2/POST" index="115"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.registrar.iastate.edu/Shibboleth.sso/SAML2/POST" index="116"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://georgetown-next.courseleaf.com/Shibboleth.sso/SAML2/POST" index="117"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uaf.edu/Shibboleth.sso/SAML2/POST" index="118"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uaf-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="119"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mines-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="120"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mines-prior.courseleaf.com/Shibboleth.sso/SAML2/POST" index="121"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.mines.edu/Shibboleth.sso/SAML2/POST" index="122"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentbulletin.mines.edu/Shibboleth.sso/SAML2/POST" index="123"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gatech-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="124"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog-next.gatech.edu/Shibboleth.sso/SAML2/POST" index="125"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://temple-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="126"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uvu.edu/Shibboleth.sso/SAML2/POST" index="127"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uvu-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="128"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uwplatt-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="129"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.unc.edu/Shibboleth.sso/SAML2/POST" index="130"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unc-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="131"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.sfsu.edu/Shibboleth.sso/SAML2/POST" index="132"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sfsu-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="133"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devcatalog.utep.edu/Shibboleth.sso/SAML2/POST" index="134"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testcatalog.utep.edu/Shibboleth.sso/SAML2/POST" index="135"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">CourseLeaf</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Leepfrog Technologies CourseLeaf</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Leepfrog Technologies, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Leepfrog Technologies, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.leepfrog.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Wes Bachman</md:GivenName>
+    <md:EmailAddress>wbachman@leepfrog.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ihs.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.ihs.ac.at-idp-shibboleth.xml
index 82cda690..a461b97b 100644
--- a/swamid-interfederations-2.0/shib.ihs.ac.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.ihs.ac.at-idp-shibboleth.xml
@@ -18,8 +18,8 @@
         <mdui:DisplayName xml:lang="de">Institut für Höhere Studien</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Institute for Advanced Studies</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">http://www.ihs.ac.at/</mdui:InformationURL>
-        <mdui:Logo height="53" width="312">https://shib.ihs.ac.at/logo.jpg</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shib.ihs.ac.at/favicon.ico</mdui:Logo>
+        <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>
diff --git a/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml b/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml
index 025f183d..c327f007 100644
--- a/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml
@@ -31,32 +31,36 @@
         <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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.informit.com.au/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://shib.informit.com.au/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://shib.informit.com.au/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://shib.informit.com.au/Shibboleth.sso/DS" index="1"/>
+      <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://shib.informit.com.au/Shibboleth.sso/DS" 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://shib.informit.com.au/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://shib.informit.com.au/Shibboleth.sso/WAYF"/>
+      <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://shib.informit.com.au/Shibboleth.sso/UKfedWAYF"/>
+      <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://shib.informit.com.au/Shibboleth.sso/UKfedWAYF" index="3"/>
     </Extensions>
     <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==
+						MIIDEjCCAfqgAwIBAgIJAMJQ7W9dNntWMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXNoaWJwcmR3czAxLnJtaXQuaW50ZXJuYWwwHhcNMTYwMjE1MjMwNjM0WhcN
+						MjYwMjEyMjMwNjM0WjAkMSIwIAYDVQQDExlzaGlicHJkd3MwMS5ybWl0LmludGVy
+						bmFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsl8OCJqga3lb7Nw6
+						XgS5YrzMz7HOZKQ5FtuveFyESrQ2YkmJm4NVxXYQ74ahdYpKfjT/I7aSY5Fo0Zfs
+						RQ08ZhXLppQSaOBkPkfGzZJFAoGo5jZUzS29INjPo/vutRd787CfUwSVM/fG7CBH
+						y6LK5+yU4NaxfPu7cgXyLdT9id9vXCanktDf+8MwBcHAQDW1mDw1eqqhED6+50zS
+						p7HlZjcHlJ4O8CBmi/STrLNNIChFFYFWWhfq0dNBas4br5ro8bSmFNPXpkoK17t3
+						CM2IVKvQOnRpSy/xuun7w7uTpB3bVBiWYO5l8hZ06PDiLaGujiebV23jL35DrtGl
+						EAUvbQIDAQABo0cwRTAkBgNVHREEHTAbghlzaGlicHJkd3MwMS5ybWl0LmludGVy
+						bmFsMB0GA1UdDgQWBBT0PhB6XxNLt7dLIwr0nlxbJ9z72DANBgkqhkiG9w0BAQUF
+						AAOCAQEAdN5GfXlrkG1x4ygh1/ZwBtNgQPiaWCIBTNVSLBZCLZYU3FFPZoK26W3U
+						qj8db4lHSlm46ExSmYR4mPsFUfqmRAD6yQwVFLGll4J88Mt7iVu6M9kyBxhQJ7X/
+						UfJhnRxzYLyoDtLjp3ayynkE36f7KRnlVeukYminUnlURyW0+RR5FVgv2WBn3RRk
+						Nmi1/D0NwnlH72Pj+hfblBuhfF1eWlYWEAdC+t9LUCU32Ocox0GP8WNNDz5x41Yt
+						EKhu2M87LgaVdkNX7Byh25ha8ELXFBxMcv/uMmImAT53C9rd/4UTLaHQffFVDD1C
+						jMB14stpA71j1X9hdeFzaL/T/NYkww==
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -75,10 +79,6 @@
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/Redirect"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/Artifact"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/POST" index="1"/>
     <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"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/Artifact" index="3"/>
@@ -96,8 +96,13 @@
     <EmailAddress>mailto:support@rmitpublishing.com.au</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
-    <GivenName>Deepak</GivenName>
-    <SurName>Vasa</SurName>
-    <EmailAddress>mailto:deepak.vasa@rmit.edu.au</EmailAddress>
+    <GivenName>Dominic</GivenName>
+    <SurName>Crowther</SurName>
+    <EmailAddress>mailto:dominic.crowther@rmit.edu.au</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Loan</GivenName>
+    <SurName>Pham</SurName>
+    <EmailAddress>mailto:dominic.crowther@rmit.edu.au</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml
deleted file mode 100644
index f7d2019d..00000000
--- a/swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-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.its.fsu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Florida State University</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHHDCCBQSgAwIBAgIJAOyJ6VxozPsEMA0GCSqGSIb3DQEBBQUAMIIBFjELMAkG
-A1UEBhMCVVMxDjAMBgNVBBETBTMyMzA2MRAwDgYDVQQIEwdGbG9yaWRhMRQwEgYD
-VQQHEwtUYWxsYWhhc3NlZTEhMB8GA1UECRMYRmxvcmlkYSBTdGF0ZSBVbml2ZXJz
-aXR5MSgwJgYDVQQJEx82MTAwQyBVbml2ZXJzaXR5IENlbnRlciBNUyAyNjIwMSEw
-HwYDVQQKExhGbG9yaWRhIFN0YXRlIFVuaXZlcnNpdHkxFzAVBgNVBAsTDklUUy1N
-aWRkbGV3YXJlMSswKQYJKoZIhvcNAQkBFhxJVFMtTWlkZGxld2FyZUBhZG1pbi5m
-c3UuZWR1MRkwFwYDVQQDExBzaGliLml0cy5mc3UuZWR1MCAXDTE0MDExNTE5MTM0
-NVoYDzIxMTIxMjIyMTkxMzQ1WjCCARYxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwUz
-MjMwNjEQMA4GA1UECBMHRmxvcmlkYTEUMBIGA1UEBxMLVGFsbGFoYXNzZWUxITAf
-BgNVBAkTGEZsb3JpZGEgU3RhdGUgVW5pdmVyc2l0eTEoMCYGA1UECRMfNjEwMEMg
-VW5pdmVyc2l0eSBDZW50ZXIgTVMgMjYyMDEhMB8GA1UEChMYRmxvcmlkYSBTdGF0
-ZSBVbml2ZXJzaXR5MRcwFQYDVQQLEw5JVFMtTWlkZGxld2FyZTErMCkGCSqGSIb3
-DQEJARYcSVRTLU1pZGRsZXdhcmVAYWRtaW4uZnN1LmVkdTEZMBcGA1UEAxMQc2hp
-Yi5pdHMuZnN1LmVkdTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN3A
-S8Ioxszl8uY33i/h84lkk5pVrqBaj5oWdZtC2hKwhbO9cUDl0Fy0oB/YEeyVerZV
-QG9dO9JZp+5ydO1yiUM67U/qYffN+6pzclt4r4RPnXQwMQEEiTcruGNN3rQy/u8y
-BPAY5nkOz7ybBg7FntYmzHJY+i9w187MGac7jGmAW9TaGM66eOUS9P+lXQjjlc0i
-gEj8vlXoPe5aNz4a5rW6PczOpdpf8qYhVFTJsAzhbrXO2WICWRKETOgX6J+nX9za
-rL9c5otDNySI79Gdz0xy9bpE5ivJsxWvyxyEun0mQsTonEn/fyqyTvuc5+6XAosH
-fcfD/x0aiUOMhpgRKccWpzkLitu2QpjLPb75d03owKjnovfMxVKYxAqDwpE5xuLd
-pjoafLC64nGtBT1s+9jtTx5eYeUZX+K6bBpzIPTgX9josG5+9El72d82MrDenV6L
-PK2PrtInGlIIP85jyg05iX3N4xVaV0/FzHaSmGmHdBm7ssYjF1i2a7RwU0q+EtOy
-hEBAvU+eyJiQ/cOlCEcAqZTGt/pPeJyLMGCbFguHnjDOXlUkIlr8GmiXnS9xth7W
-R3zRwhdQNgaR8SOQ1NcMxHvXTo7UYE03QUrYNNtCcXqGM9YEi5NP4/GVIhBLSntj
-T8Km5daR4G8aPyjsibFmIT6SJpeOn4Tkr1BVilatAgMBAAGjZzBlMEQGA1UdEQQ9
-MDuCEHNoaWIuaXRzLmZzdS5lZHWGJ2h0dHBzOi8vc2hpYi5pdHMuZnN1LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUH7v4eLmZUMErxgbbwx6JlI2svoswDQYJ
-KoZIhvcNAQEFBQADggIBAM2ycz4FwhL/2vApURa/hpmlp0zGhsX2F60vm9HDxTFe
-MadcRHuPRNAeYT6sSXHZrKbgPBMxcYwFDZbNzJW2+WmDzr+NRMdHLKWc/gpns2l0
-O83fw9EihpatOCDaaWx2AQ+YANrC+hsTTKWUypGukV4iz2UfLofOgzzrqkVADImO
-o71xkmtGTdNi8LIZ5TAh0VdjgulLmhtO00fQVUX67pfatJqqymG5sZSWIF7TJ6Mg
-sH26ppdQm6KI2gk8fqVEon1db4JmHqKyWmFHJk71FsP9no0zzuQFnYO2rVYuYOUu
-58bsvp29wdHdyudRx04bCVh2EWEpgqhmAv95I2YC2mSTOQappUB/oBmdfmLJIYLI
-2kbl8Y2NRpBXdk9qMPYCclR6wOviatjMQo9sEy3qIejwyv+a01zEkiMnJSSNyX8M
-ttiOQplZe5GdXU/zC0nx5IOHMIkfjQqtFVn1EWgUuXqDheBSMdTlKpg6Vur7GnD2
-fTdPc7y0ZqurUa2Ux5VOnv+ZvdcsbCVrLPdROZZDcmXhmfb9sq6UzCskN0WRnHpf
-RLpLfE22HaiKomONZ9OhbEW7Wz+ht/oA9AGbJdmpYEqEXBPe5tipffXzGLzzQd5Z
-tkZaeBriA8z142lSzChElmO1LRQ4pSvdjX6yr0BMb3PFQR2w/n0SG9uStXJNobxg
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHMzCCBhugAwIBAgIRANeIvvgkRHOihdJ4fkShxBYwDQYJKoZIhvcNAQEFBQAw
-gZMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtl
-IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMY
-aHR0cDovL3d3dy51c2VydHJ1c3QuY29tMRswGQYDVQQDExJVVE4gLSBEQVRBQ29y
-cCBTR0MwHhcNMTEwMTMxMDAwMDAwWhcNMTMwMTMwMjM1OTU5WjCCASoxCzAJBgNV
-BAYTAlVTMQ4wDAYDVQQREwUzMjMwNjEQMA4GA1UECBMHRmxvcmlkYTEUMBIGA1UE
-BxMLVGFsbGFoYXNzZWUxITAfBgNVBAkTGEZsb3JpZGEgU3RhdGUgVW5pdmVyc2l0
-eTEoMCYGA1UECRMfNjEwMEMgVW5pdmVyc2l0eSBDZW50ZXIgTVMgMjYyMDEhMB8G
-A1UEChMYRmxvcmlkYSBTdGF0ZSBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJVFMxKzAp
-BgNVBAsTIkhvc3RlZCBieSBGbG9yaWRhIFN0YXRlIFVuaXZlcnNpdHkxIDAeBgNV
-BAsTF0NvbW9kbyBTR0MgU1NMIFdpbGRjYXJkMRYwFAYDVQQDFA0qLml0cy5mc3Uu
-ZWR1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3cBLwijGzOXy5jfe
-L+HziWSTmlWuoFqPmhZ1m0LaErCFs71xQOXQXLSgH9gR7JV6tlVAb1070lmn7nJ0
-7XKJQzrtT+ph9837qnNyW3ivhE+ddDAxAQSJNyu4Y03etDL+7zIE8BjmeQ7PvJsG
-DsWe1ibMclj6L3DXzswZpzuMaYBb1NoYzrp45RL0/6VdCOOVzSKASPy+Veg97lo3
-Phrmtbo9zM6l2l/ypiFUVMmwDOFutc7ZYgJZEoRM6Bfon6df3Nqsv1zmi0M3JIjv
-0Z3PTHL1ukTmK8mzFa/LHIS6fSZCxOicSf9/KrJO+5zn7pcCiwd9x8P/HRqJQ4yG
-mBEpxxanOQuK27ZCmMs9vvl3TejAqOei98zFUpjECoPCkTnG4t2mOhp8sLrica0F
-PWz72O1PHl5h5Rlf4rpsGnMg9OBf2Oiwbn70SXvZ3zYysN6dXos8rY+u0icaUgg/
-zmPKDTmJfc3jFVpXT8XMdpKYaYd0GbuyxiMXWLZrtHBTSr4S07KEQEC9T57ImJD9
-w6UIRwCplMa3+k94nIswYJsWC4eeMM5eVSQiWvwaaJedL3G2HtZHfNHCF1A2BpHx
-I5DU1wzEe9dOjtRgTTdBStg020JxeoYz1gSLk0/j8ZUiEEtKe2NPwqbl1pHgbxo/
-KOyJsWYhPpIml46fhOSvUFWKVq0CAwEAAaOCAeYwggHiMB8GA1UdIwQYMBaAFFMy
-0bPPf/rg8aBdhU6S0p5FHbRPMB0GA1UdDgQWBBQfu/h4uZlQwSvGBtvDHomUjay+
-izAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADA0BgNVHSUELTArBggrBgEF
-BQcDAQYIKwYBBQUHAwIGCisGAQQBgjcKAwMGCWCGSAGG+EIEATBGBgNVHSAEPzA9
-MDsGDCsGAQQBsjEBAgEDBDArMCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5j
-b21vZG8uY29tL0NQUzBtBgNVHR8EZjBkMDGgL6AthitodHRwOi8vY3JsLmNvbW9k
-b2NhLmNvbS9VVE4tREFUQUNvcnBTR0MuY3JsMC+gLaArhilodHRwOi8vY3JsLmNv
-bW9kby5uZXQvVVROLURBVEFDb3JwU0dDLmNybDBuBggrBgEFBQcBAQRiMGAwOAYI
-KwYBBQUHMAKGLGh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL1VUTkFkZFRydXN0U0dD
-Q0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wJQYD
-VR0RBB4wHIINKi5pdHMuZnN1LmVkdYILaXRzLmZzdS5lZHUwDQYJKoZIhvcNAQEF
-BQADggEBAH0d8k4qW7pbDYGk3w9ydUuOMPZbiTzAZdtNlBTWegSIYz+XqKDLBUhc
-WAqNlEzP6EgMIqbotu6fDPslqjh+E302DSJIHAXMyY6LpacEszxBxQGTg+sv4W5z
-/b3AYJ1/U7wfNSHIucZUEaR5sFlVAylrFD5vvTXssmBaxjoAguR1UR9VETSVDiQf
-PwB3HhlDuzfGb2f38Lih4zMBOLTpfYmrk61R8EeZy0EfbihvNaXPCPwiEIHbO782
-Y48ocWiFA1v3w9AiVGRbgItfnaZ9I/tWZeRuegm4D0pcJdVnxoRDqDA54vEQlUt1
-2eRDf3zvQVY3IgWWsBv6VDWwwBhjYY4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.its.fsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.its.fsu.edu/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHHDCCBQSgAwIBAgIJAOyJ6VxozPsEMA0GCSqGSIb3DQEBBQUAMIIBFjELMAkG
-A1UEBhMCVVMxDjAMBgNVBBETBTMyMzA2MRAwDgYDVQQIEwdGbG9yaWRhMRQwEgYD
-VQQHEwtUYWxsYWhhc3NlZTEhMB8GA1UECRMYRmxvcmlkYSBTdGF0ZSBVbml2ZXJz
-aXR5MSgwJgYDVQQJEx82MTAwQyBVbml2ZXJzaXR5IENlbnRlciBNUyAyNjIwMSEw
-HwYDVQQKExhGbG9yaWRhIFN0YXRlIFVuaXZlcnNpdHkxFzAVBgNVBAsTDklUUy1N
-aWRkbGV3YXJlMSswKQYJKoZIhvcNAQkBFhxJVFMtTWlkZGxld2FyZUBhZG1pbi5m
-c3UuZWR1MRkwFwYDVQQDExBzaGliLml0cy5mc3UuZWR1MCAXDTE0MDExNTE5MTM0
-NVoYDzIxMTIxMjIyMTkxMzQ1WjCCARYxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwUz
-MjMwNjEQMA4GA1UECBMHRmxvcmlkYTEUMBIGA1UEBxMLVGFsbGFoYXNzZWUxITAf
-BgNVBAkTGEZsb3JpZGEgU3RhdGUgVW5pdmVyc2l0eTEoMCYGA1UECRMfNjEwMEMg
-VW5pdmVyc2l0eSBDZW50ZXIgTVMgMjYyMDEhMB8GA1UEChMYRmxvcmlkYSBTdGF0
-ZSBVbml2ZXJzaXR5MRcwFQYDVQQLEw5JVFMtTWlkZGxld2FyZTErMCkGCSqGSIb3
-DQEJARYcSVRTLU1pZGRsZXdhcmVAYWRtaW4uZnN1LmVkdTEZMBcGA1UEAxMQc2hp
-Yi5pdHMuZnN1LmVkdTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN3A
-S8Ioxszl8uY33i/h84lkk5pVrqBaj5oWdZtC2hKwhbO9cUDl0Fy0oB/YEeyVerZV
-QG9dO9JZp+5ydO1yiUM67U/qYffN+6pzclt4r4RPnXQwMQEEiTcruGNN3rQy/u8y
-BPAY5nkOz7ybBg7FntYmzHJY+i9w187MGac7jGmAW9TaGM66eOUS9P+lXQjjlc0i
-gEj8vlXoPe5aNz4a5rW6PczOpdpf8qYhVFTJsAzhbrXO2WICWRKETOgX6J+nX9za
-rL9c5otDNySI79Gdz0xy9bpE5ivJsxWvyxyEun0mQsTonEn/fyqyTvuc5+6XAosH
-fcfD/x0aiUOMhpgRKccWpzkLitu2QpjLPb75d03owKjnovfMxVKYxAqDwpE5xuLd
-pjoafLC64nGtBT1s+9jtTx5eYeUZX+K6bBpzIPTgX9josG5+9El72d82MrDenV6L
-PK2PrtInGlIIP85jyg05iX3N4xVaV0/FzHaSmGmHdBm7ssYjF1i2a7RwU0q+EtOy
-hEBAvU+eyJiQ/cOlCEcAqZTGt/pPeJyLMGCbFguHnjDOXlUkIlr8GmiXnS9xth7W
-R3zRwhdQNgaR8SOQ1NcMxHvXTo7UYE03QUrYNNtCcXqGM9YEi5NP4/GVIhBLSntj
-T8Km5daR4G8aPyjsibFmIT6SJpeOn4Tkr1BVilatAgMBAAGjZzBlMEQGA1UdEQQ9
-MDuCEHNoaWIuaXRzLmZzdS5lZHWGJ2h0dHBzOi8vc2hpYi5pdHMuZnN1LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUH7v4eLmZUMErxgbbwx6JlI2svoswDQYJ
-KoZIhvcNAQEFBQADggIBAM2ycz4FwhL/2vApURa/hpmlp0zGhsX2F60vm9HDxTFe
-MadcRHuPRNAeYT6sSXHZrKbgPBMxcYwFDZbNzJW2+WmDzr+NRMdHLKWc/gpns2l0
-O83fw9EihpatOCDaaWx2AQ+YANrC+hsTTKWUypGukV4iz2UfLofOgzzrqkVADImO
-o71xkmtGTdNi8LIZ5TAh0VdjgulLmhtO00fQVUX67pfatJqqymG5sZSWIF7TJ6Mg
-sH26ppdQm6KI2gk8fqVEon1db4JmHqKyWmFHJk71FsP9no0zzuQFnYO2rVYuYOUu
-58bsvp29wdHdyudRx04bCVh2EWEpgqhmAv95I2YC2mSTOQappUB/oBmdfmLJIYLI
-2kbl8Y2NRpBXdk9qMPYCclR6wOviatjMQo9sEy3qIejwyv+a01zEkiMnJSSNyX8M
-ttiOQplZe5GdXU/zC0nx5IOHMIkfjQqtFVn1EWgUuXqDheBSMdTlKpg6Vur7GnD2
-fTdPc7y0ZqurUa2Ux5VOnv+ZvdcsbCVrLPdROZZDcmXhmfb9sq6UzCskN0WRnHpf
-RLpLfE22HaiKomONZ9OhbEW7Wz+ht/oA9AGbJdmpYEqEXBPe5tipffXzGLzzQd5Z
-tkZaeBriA8z142lSzChElmO1LRQ4pSvdjX6yr0BMb3PFQR2w/n0SG9uStXJNobxg
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHMzCCBhugAwIBAgIRANeIvvgkRHOihdJ4fkShxBYwDQYJKoZIhvcNAQEFBQAw
-gZMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtl
-IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMY
-aHR0cDovL3d3dy51c2VydHJ1c3QuY29tMRswGQYDVQQDExJVVE4gLSBEQVRBQ29y
-cCBTR0MwHhcNMTEwMTMxMDAwMDAwWhcNMTMwMTMwMjM1OTU5WjCCASoxCzAJBgNV
-BAYTAlVTMQ4wDAYDVQQREwUzMjMwNjEQMA4GA1UECBMHRmxvcmlkYTEUMBIGA1UE
-BxMLVGFsbGFoYXNzZWUxITAfBgNVBAkTGEZsb3JpZGEgU3RhdGUgVW5pdmVyc2l0
-eTEoMCYGA1UECRMfNjEwMEMgVW5pdmVyc2l0eSBDZW50ZXIgTVMgMjYyMDEhMB8G
-A1UEChMYRmxvcmlkYSBTdGF0ZSBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJVFMxKzAp
-BgNVBAsTIkhvc3RlZCBieSBGbG9yaWRhIFN0YXRlIFVuaXZlcnNpdHkxIDAeBgNV
-BAsTF0NvbW9kbyBTR0MgU1NMIFdpbGRjYXJkMRYwFAYDVQQDFA0qLml0cy5mc3Uu
-ZWR1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3cBLwijGzOXy5jfe
-L+HziWSTmlWuoFqPmhZ1m0LaErCFs71xQOXQXLSgH9gR7JV6tlVAb1070lmn7nJ0
-7XKJQzrtT+ph9837qnNyW3ivhE+ddDAxAQSJNyu4Y03etDL+7zIE8BjmeQ7PvJsG
-DsWe1ibMclj6L3DXzswZpzuMaYBb1NoYzrp45RL0/6VdCOOVzSKASPy+Veg97lo3
-Phrmtbo9zM6l2l/ypiFUVMmwDOFutc7ZYgJZEoRM6Bfon6df3Nqsv1zmi0M3JIjv
-0Z3PTHL1ukTmK8mzFa/LHIS6fSZCxOicSf9/KrJO+5zn7pcCiwd9x8P/HRqJQ4yG
-mBEpxxanOQuK27ZCmMs9vvl3TejAqOei98zFUpjECoPCkTnG4t2mOhp8sLrica0F
-PWz72O1PHl5h5Rlf4rpsGnMg9OBf2Oiwbn70SXvZ3zYysN6dXos8rY+u0icaUgg/
-zmPKDTmJfc3jFVpXT8XMdpKYaYd0GbuyxiMXWLZrtHBTSr4S07KEQEC9T57ImJD9
-w6UIRwCplMa3+k94nIswYJsWC4eeMM5eVSQiWvwaaJedL3G2HtZHfNHCF1A2BpHx
-I5DU1wzEe9dOjtRgTTdBStg020JxeoYz1gSLk0/j8ZUiEEtKe2NPwqbl1pHgbxo/
-KOyJsWYhPpIml46fhOSvUFWKVq0CAwEAAaOCAeYwggHiMB8GA1UdIwQYMBaAFFMy
-0bPPf/rg8aBdhU6S0p5FHbRPMB0GA1UdDgQWBBQfu/h4uZlQwSvGBtvDHomUjay+
-izAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADA0BgNVHSUELTArBggrBgEF
-BQcDAQYIKwYBBQUHAwIGCisGAQQBgjcKAwMGCWCGSAGG+EIEATBGBgNVHSAEPzA9
-MDsGDCsGAQQBsjEBAgEDBDArMCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5j
-b21vZG8uY29tL0NQUzBtBgNVHR8EZjBkMDGgL6AthitodHRwOi8vY3JsLmNvbW9k
-b2NhLmNvbS9VVE4tREFUQUNvcnBTR0MuY3JsMC+gLaArhilodHRwOi8vY3JsLmNv
-bW9kby5uZXQvVVROLURBVEFDb3JwU0dDLmNybDBuBggrBgEFBQcBAQRiMGAwOAYI
-KwYBBQUHMAKGLGh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL1VUTkFkZFRydXN0U0dD
-Q0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wJQYD
-VR0RBB4wHIINKi5pdHMuZnN1LmVkdYILaXRzLmZzdS5lZHUwDQYJKoZIhvcNAQEF
-BQADggEBAH0d8k4qW7pbDYGk3w9ydUuOMPZbiTzAZdtNlBTWegSIYz+XqKDLBUhc
-WAqNlEzP6EgMIqbotu6fDPslqjh+E302DSJIHAXMyY6LpacEszxBxQGTg+sv4W5z
-/b3AYJ1/U7wfNSHIucZUEaR5sFlVAylrFD5vvTXssmBaxjoAguR1UR9VETSVDiQf
-PwB3HhlDuzfGb2f38Lih4zMBOLTpfYmrk61R8EeZy0EfbihvNaXPCPwiEIHbO782
-Y48ocWiFA1v3w9AiVGRbgItfnaZ9I/tWZeRuegm4D0pcJdVnxoRDqDA54vEQlUt1
-2eRDf3zvQVY3IgWWsBv6VDWwwBhjYY4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.its.fsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Florida State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Florida State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fsu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Chuck Kemeny</md:GivenName>
-    <md:EmailAddress>ckemeny@admin.fsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Diane Higgins</md:GivenName>
-    <md:EmailAddress>dhiggins@fsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Jonathan Liedy</md:GivenName>
-    <md:EmailAddress>jliedy@fsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml
deleted file mode 100644
index aff8ea0a..00000000
--- a/swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-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.lternet.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lternet.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">LTERN (Long Term Ecological Research Network)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The U.S. LTER Network is an National Science Funded project that includes 26 research sites encompasing a wide range of ecosystem types spanning broad ranges of environmental conditions and human domination of the landscape. The geographic distribution of sites ranges from Alaska to Antarctica and from the Caribbean to French Polynesia and includes agricultural lands, alpine tundra, barrier islands, coastal lagoons, cold and hot deserts, coral reefs, estuaries, forests, freshwater wetlands, grasslands, kelp forests, lakes, open ocean, savannas, streams, and urban landscapes.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.lternet.edu</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUNQ0S3k+4XlqeFEPjY/nhbLcHvaAwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQc2hpYi5sdGVybmV0LmVkdTAeFw0xMTA1MjYxNDUxMTRa
-Fw0zMTA1MjYxNDUxMTRaMBsxGTAXBgNVBAMTEHNoaWIubHRlcm5ldC5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnFvUgQ4yMEsHe9AVhOfn+1oh6
-7AYPw+9XgL6FRJ12Gfxmvrb/irE0+50xUV5L+okUGhUuyoKTQHBSUOajmlszC4AR
-b8xpYvPQF8WO/wIySxHdHOHrhCYVG96vyosM2U3FgNQ168pdrjooqK4DO2MiBe3e
-ts8nc/ZI0QRrrcQ0ictiw1TAoWj5RX2gRiCgkoLc2sP5mKI4IrnGWaD4Pl+aGIm8
-ceOGIybtVGFXsrbz0pyHZarvIRguKDj3HePZBgCZ/ilixShuEkYaoxLLj0TjSBxc
-QupkXi4rgNKBiyjXu+mSVqi3Ugvvhrsf89MAuCWSox8dPhCxdtfL0LSIeH9LAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEHNoaWIubHRlcm5ldC5lZHWGJ2h0dHBzOi8vc2hp
-Yi5sdGVybmV0LmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUO/dzbA/SAWfv
-qW5u9ojjlAes5z8wDQYJKoZIhvcNAQEFBQADggEBAG0ebyLXBHau5V06fjQZTD8O
-1oygZEeF1veVV7wnMiLm1hz9b4Wq9pVwXmxGTCtz3ugPm7WfgZNYUvYCm4d4dWQn
-OgPukcpyu57Bi7FWqcLo47rmPhImSQMxr/Z+f9K+wda28yBgxrTwOal6+yOEQTxj
-4qxmVQruRdw8ig+Nj+Ia5+78XpscxQ87uEhrnzSpa9s6g6a20bmbQboH9IWT6WTT
-TRpg/Tzxum6NIPdd4P4mJ2i4h8ivHl59Rl/X3A6H/YvGfMoJIsiuGU5/ydC4gbBL
-aBW874sHe5I9WUlV3L8bfagPwFbw54Htg+fgzSWtN/I0mBUOpm3CglPzd4SvQ5A=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.lternet.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lternet.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.lternet.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.lternet.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.lternet.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lternet.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUNQ0S3k+4XlqeFEPjY/nhbLcHvaAwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQc2hpYi5sdGVybmV0LmVkdTAeFw0xMTA1MjYxNDUxMTRa
-Fw0zMTA1MjYxNDUxMTRaMBsxGTAXBgNVBAMTEHNoaWIubHRlcm5ldC5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnFvUgQ4yMEsHe9AVhOfn+1oh6
-7AYPw+9XgL6FRJ12Gfxmvrb/irE0+50xUV5L+okUGhUuyoKTQHBSUOajmlszC4AR
-b8xpYvPQF8WO/wIySxHdHOHrhCYVG96vyosM2U3FgNQ168pdrjooqK4DO2MiBe3e
-ts8nc/ZI0QRrrcQ0ictiw1TAoWj5RX2gRiCgkoLc2sP5mKI4IrnGWaD4Pl+aGIm8
-ceOGIybtVGFXsrbz0pyHZarvIRguKDj3HePZBgCZ/ilixShuEkYaoxLLj0TjSBxc
-QupkXi4rgNKBiyjXu+mSVqi3Ugvvhrsf89MAuCWSox8dPhCxdtfL0LSIeH9LAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEHNoaWIubHRlcm5ldC5lZHWGJ2h0dHBzOi8vc2hp
-Yi5sdGVybmV0LmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUO/dzbA/SAWfv
-qW5u9ojjlAes5z8wDQYJKoZIhvcNAQEFBQADggEBAG0ebyLXBHau5V06fjQZTD8O
-1oygZEeF1veVV7wnMiLm1hz9b4Wq9pVwXmxGTCtz3ugPm7WfgZNYUvYCm4d4dWQn
-OgPukcpyu57Bi7FWqcLo47rmPhImSQMxr/Z+f9K+wda28yBgxrTwOal6+yOEQTxj
-4qxmVQruRdw8ig+Nj+Ia5+78XpscxQ87uEhrnzSpa9s6g6a20bmbQboH9IWT6WTT
-TRpg/Tzxum6NIPdd4P4mJ2i4h8ivHl59Rl/X3A6H/YvGfMoJIsiuGU5/ydC4gbBL
-aBW874sHe5I9WUlV3L8bfagPwFbw54Htg+fgzSWtN/I0mBUOpm3CglPzd4SvQ5A=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.lternet.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LTERN (Long Term Ecological Research Network)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">LTERN (Long Term Ecological Research Network)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.lternet.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mark Servilla</md:GivenName>
-    <md:EmailAddress>servilla@lternet.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml
index 453cf9aa..3a4d2b31 100644
--- a/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.oclc.org/shibboleth">
   <!--
-		This is a service provider for OCLC (UK) Limited.
-		Uses 1.3 of the Shib SP, and a home-brew WAYF
-		written in Java using Tomcat as a servlet container.
+		This is an "OCLC FirstSearch" Shibboleth SP for OCLC (UK) Limited.
 	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
diff --git a/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml
index ecfec44d..f7a52a3d 100644
--- a/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml
@@ -18,7 +18,7 @@
         <mdui:DisplayName xml:lang="en">University of Nebraska-Lincoln</mdui:DisplayName>
         <mdui:Description xml:lang="en">The University of Nebraska-Lincoln, chartered in 1869, is an educational institution of international stature. UNL is listed by the Carnegie Foundation within the "Research Universities (very high research activity)" category. UNL is a land-grant university and a member of the Association of Public and Land-grant Universities (APLU). The university is accredited by the Higher Learning Commission of the North Central Association of Colleges and Schools.</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://www.unl.edu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unl.edu/is/about/UNLprivacy.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://its.unl.edu/unlprivacypolicy</mdui:PrivacyStatementURL>
         <mdui:Logo height="67" width="66" xml:lang="en">https://idm.unl.edu/wdn/templates_3.0/images/logo.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
@@ -47,45 +47,11 @@ D0DIYdBk2yItSdfimeC1/cwOOK1xLZfLs9q46OUL7UU=
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.unl.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.unl.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.unl.edu/idp/profile/Shibboleth/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.unl.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.unl.edu/idp/profile/SAML2/POST/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.unl.edu/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unl.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVALR4hUzlhDFUyPrCzbCR8aB8/okIMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDHNoaWIudW5sLmVkdTAeFw0xMDA5MTAyMTA4MjZaFw0z
-MDA5MTAyMTA4MjZaMBcxFTATBgNVBAMTDHNoaWIudW5sLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJhLs+N32LNQicvVL26oZcWyU46MixkhDOdG
-h5XmzO8vWckrIPs+4LUG5U9ozfIksiYVVJW4mTl21RID0RJ9l3svZeKvEKBGrxUR
-6mQb1nQQcUPVVxNlMIZ5rlWfyffWcP686kGYTdWMU14KyflrVyFW7Vq70izKe9oT
-nX+bEclWv6KjzFayWJcIYCE4+jX7GvxSMyQTh3TRenUGOh9iukzIHlApI9bfzh89
-OdHsHy3WPmvoZYRTLeeTtG+qvzNvD+IMBNCUM9f8bRYc6N790/vBHn7kU5XSiMIv
-5sXFMt5nwNPDq3+37vY7xpu+r74tcT3HpXF5OeOPmG2OC8FSIvMCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMc2hpYi51bmwuZWR1hiNodHRwczovL3NoaWIudW5sLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTEOLq42EOS0daP8iT0PJ1kc4rMUwDQYJ
-KoZIhvcNAQEFBQADggEBAIAZpYEcXhU317hPR08os2NC3TM2K6BaNrRm53fu+tIT
-zsdHv7cfQ7ONLUE5vC0Wis6g468wGOKi01ueSrIU7emQUgQaxRoCbinUsSu1R6a1
-NP/c0ZhOo88hweNRac8zpZccjUi9Oc3WssQ/uHbkumN2hM7BhvC/4NRg5NRMWLNs
-ko224ENGUqVqFkBiZJWH5ooxOM/8Gt4Ut1cTkNxyMSJvno7Gki95l0M45fNfSbWw
-voZFOzm0IBZx1K786PNxotISs/WY/R7yJA91L0FCzrXFMh+jK5L1nCg5ZfEL0YEM
-D0DIYdBk2yItSdfimeC1/cwOOK1xLZfLs9q46OUL7UU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.unl.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.unl.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">University of Nebraska-Lincoln</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">University of Nebraska-Lincoln</md:OrganizationDisplayName>
@@ -103,4 +69,8 @@ D0DIYdBk2yItSdfimeC1/cwOOK1xLZfLs9q46OUL7UU=
     <md:GivenName>Brett Bieber</md:GivenName>
     <md:EmailAddress>bieber@unl.edu</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>UNL Security Team</md:GivenName>
+    <md:EmailAddress>security@unl.edu</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib1.coastal.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib1.coastal.edu-idp-shibboleth.xml
index e5c7657d..bfa8bbf6 100644
--- a/swamid-interfederations-2.0/shib1.coastal.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib1.coastal.edu-idp-shibboleth.xml
@@ -20,33 +20,6 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDbTCCAlWgAwIBAgIEcWV8mDANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJ1
-czELMAkGA1UECBMCc2MxDzANBgNVBAcTBmNvbndheTEQMA4GA1UEChMHY29hc3Rh
-bDEMMAoGA1UECxMDY2N1MRowGAYDVQQDExFzaGliMS5jb2FzdGFsLmVkdTAeFw0x
-NTEyMDkyMTIzMjVaFw0yNTEyMDYyMTIzMjVaMGcxCzAJBgNVBAYTAnVzMQswCQYD
-VQQIEwJzYzEPMA0GA1UEBxMGY29ud2F5MRAwDgYDVQQKEwdjb2FzdGFsMQwwCgYD
-VQQLEwNjY3UxGjAYBgNVBAMTEXNoaWIxLmNvYXN0YWwuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxuxRIL4OA5Dp3y3yARjUbE0JYWs4VbHs4iTu
-+le9+ToZ5TWo1VBsxEK7RZYUMu/sAksvXZ0Bu63Sqm+Su/6dCJi2cET3Q4AnrAXm
-hLMZ7J8uCQuKJgh1uIGNn6FXT/f1p+jJ/TzDqDx2VSE5eioB0e1TzIaU6AiszVnP
-VqtZDTzgz9sMp5yLAyMrZ+kb/M+XB5QiMkBLcVO0GZCv+h3+miXX1ZHF0BgJDfQ1
-J2sbn9uCeFN4Kx2OL1Hdl5eIpZuL4h9W3xysB+Q2yoetVZ+8V4IGujNxEuWhPzmC
-vJh1Og2/gDTZ/JpCYM+gmIsDA0f6y9gdW1O4yvgxE3encoUt2QIDAQABoyEwHzAd
-BgNVHQ4EFgQUA2hOJjUOrRjvO8R4Dwv3tDmwsHQwDQYJKoZIhvcNAQELBQADggEB
-ADFxQVRvspUloAojY1gRuJ39eGwMAQ/fhXNlblyWOCM2JklSuCsIEg0UTwSHMqaD
-l2WxXCB3oKwH0fELbKoP1FVPIofRbGGXwRfrYHMGRT8zq0dkB6kpMSqpOWAyYZI1
-wj7x/roPxmBB7dqwuMpe+9bcuwr7IZaixSy4egNIfKjmBWWkjCU2Gf+gNp59xEAY
-8zaxNFuDJUsNrugQkPSwd5neL4YJg5DtDWLHnlx49Bsu++8gCQtfUVCtMpJTRpA7
-S0v9splMv9Fef+mT4OC/STxhqwssEjXW5UabRkX8pCUJ1Io8XFolm17nFT4zHqyb
-EorC5nk0gN9/NXYq3M5P5iM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAPmtKMkTjP6RBo5vqaqeBo9Cwh65MA0GCSqGSIb3DQEB
 CwUAMBwxGjAYBgNVBAMMEXNoaWIxLmNvYXN0YWwuZWR1MB4XDTE1MTIyMTE5NDAw
 OFoXDTM1MTIyMTE5NDAwOFowHDEaMBgGA1UEAwwRc2hpYjEuY29hc3RhbC5lZHUw
diff --git a/swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml
deleted file mode 100644
index af5ee162..00000000
--- a/swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2.rowan.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://shib2.rowan.edu" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rowan.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Rowan University</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUV1h7BDn1TSOjSv/+LSq0IE3Oy+AwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPc2hpYjIucm93YW4uZWR1MB4XDTEzMDkxMTE5MDAyMVoX
-DTMzMDkxMTE5MDAyMVowGjEYMBYGA1UEAxMPc2hpYjIucm93YW4uZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dC45ZVWTnEsm6ku5CSWBf/yKB6G
-LGYNi4aSG5sYvw88ODE0wAHDxeVUpUV93Mq3HpsNVD7ciBCynYyeGy9myDPd8GF+
-LgozcIMKEL9y3pys8EfOz+ZiewJZXXldwuI8ULYZ8tApAJofeO+rZYW5TleyNEE/
-l/sxuEU/GzYIFS5Adr0SpzL5UGIr0WR+unkgv3cdz1lJwJW8ZxqJLNOEnwPQniXt
-5t7im0X7Jb2mMeAqtkfi3t9UGiprYV5gltCSV+phWA7uw/eIBCf+T+MrLOA/bJeK
-f4tHpCGGGn9dWgHczBq3tJcmqrU9KZXMjP8F6EX+UhlI9M0kQcXtFaDfyQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9zaGliMi5yb3dhbi5lZHWGJmh0dHBzOi8vc2hpYjIu
-cm93YW4uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQD5L1958tIrqBF2l7b
-ItJU0uhJnzANBgkqhkiG9w0BAQUFAAOCAQEAF+xcIxBd1V8BtD5VKV5CPdBY9JXX
-JrsB9ETj+9Dtv12c7XdbwoumlkdORbDXsoAB156kF5VJSEhOU45QpRI5o6mwQzBR
-oKw1Zem0MLWTgrLDZvFeQzEO/lcnnKSa82sEJ+ooyk59Pjn8ZHNwV/76xGx4cIe0
-VYrgZQqBSiVJaCaEQUndNw3+9d4SNIfQ+KPfsFyJE/0RXzDO35RqT8gP6vqsTtyr
-mNCEYGye/xJOKXb8vnyf/r6sCDiaJCBxB6pwHiRS5TlxOXJOx/CPLQe3oLBHm6NV
-V4Hgw585iFPY3CHO+EezoWVCuDIVlvcnMAHlLYh/kZypvjuuIzizI2l28g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.rowan.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.rowan.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.rowan.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.rowan.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.rowan.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rowan.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUV1h7BDn1TSOjSv/+LSq0IE3Oy+AwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPc2hpYjIucm93YW4uZWR1MB4XDTEzMDkxMTE5MDAyMVoX
-DTMzMDkxMTE5MDAyMVowGjEYMBYGA1UEAxMPc2hpYjIucm93YW4uZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dC45ZVWTnEsm6ku5CSWBf/yKB6G
-LGYNi4aSG5sYvw88ODE0wAHDxeVUpUV93Mq3HpsNVD7ciBCynYyeGy9myDPd8GF+
-LgozcIMKEL9y3pys8EfOz+ZiewJZXXldwuI8ULYZ8tApAJofeO+rZYW5TleyNEE/
-l/sxuEU/GzYIFS5Adr0SpzL5UGIr0WR+unkgv3cdz1lJwJW8ZxqJLNOEnwPQniXt
-5t7im0X7Jb2mMeAqtkfi3t9UGiprYV5gltCSV+phWA7uw/eIBCf+T+MrLOA/bJeK
-f4tHpCGGGn9dWgHczBq3tJcmqrU9KZXMjP8F6EX+UhlI9M0kQcXtFaDfyQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9zaGliMi5yb3dhbi5lZHWGJmh0dHBzOi8vc2hpYjIu
-cm93YW4uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQD5L1958tIrqBF2l7b
-ItJU0uhJnzANBgkqhkiG9w0BAQUFAAOCAQEAF+xcIxBd1V8BtD5VKV5CPdBY9JXX
-JrsB9ETj+9Dtv12c7XdbwoumlkdORbDXsoAB156kF5VJSEhOU45QpRI5o6mwQzBR
-oKw1Zem0MLWTgrLDZvFeQzEO/lcnnKSa82sEJ+ooyk59Pjn8ZHNwV/76xGx4cIe0
-VYrgZQqBSiVJaCaEQUndNw3+9d4SNIfQ+KPfsFyJE/0RXzDO35RqT8gP6vqsTtyr
-mNCEYGye/xJOKXb8vnyf/r6sCDiaJCBxB6pwHiRS5TlxOXJOx/CPLQe3oLBHm6NV
-V4Hgw585iFPY3CHO+EezoWVCuDIVlvcnMAHlLYh/kZypvjuuIzizI2l28g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.rowan.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Rowan University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Rowan University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rowan.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Josh Grochowski</md:GivenName>
-    <md:EmailAddress>grochowski@rowan.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml
deleted file mode 100644
index c03e8446..00000000
--- a/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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/shibb1.hj.se-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml
index f52965fa..327e7328 100644
--- a/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml
@@ -20,8 +20,8 @@
         <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="84" width="749" xml:lang="sv">https://shibb1.hj.se/idp/images/logo.png</mdui:Logo>
-        <mdui:Logo height="84" width="749" xml:lang="en">https://shibb1.hj.se/idp/images/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="84" width="749">https://shibb1.hj.se/idp/images/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="84" width="749">https://shibb1.hj.se/idp/images/logo.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">http://hj.se/it-helpdesk/faq---manualer/mitt-anvandarkonto/ovrigt/gemensam-inloggningstjanst.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://hj.se/en/it-helpdesk/ju-faq---manuals/my-user-account/other/joint-web-login-service.html</mdui:PrivacyStatementURL>
         <mdui:Keywords xml:lang="sv">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
index 745cc7a6..159de9fd 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
@@ -64,6 +64,50 @@ yRrHi0bPUSEYjGLZ5Muj2HV6lkYUuuhQxYEy8YCM01kN3A==
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.uni-regensburg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.uni-regensburg.de,OU=Rechenzentrum,O=Universitaet Regensburg,L=Regensburg,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGfjCCBWagAwIBAgIHGywrIcyZwTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
+A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxIDAeBgNVBAMTF1VuaSBSZWdl
+bnNidXJnIENBIC0gRzAxMSQwIgYJKoZIhvcNAQkBFhVwa2lAdW5pLXJlZ2Vuc2J1
+cmcuZGUwHhcNMTYwNDEyMDgxMDU4WhcNMTkwNzA5MjM1OTAwWjCBmDELMAkGA1UE
+BhMCREUxDzANBgNVBAgMBkJheWVybjETMBEGA1UEBwwKUmVnZW5zYnVyZzEgMB4G
+A1UECgwXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxFjAUBgNVBAsMDVJlY2hlbnpl
+bnRydW0xKTAnBgNVBAMMIHNoaWJib2xldGgtaWRwLnVuaS1yZWdlbnNidXJnLmRl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7i+RKUaVAruh38IbGPaR
+3bXZ5ATX8ITFmnyXb7jiGUSumDGFP6WB8KYG5DBOj7IJg8XTcjB+VoHk5OB4O5Rd
+/O/XO66FGWl46yufdzeI3GAVNLN2pqtgbzufOIuIFs/8Ggx7VZJOuuhchgNRCnnP
+o5G7Ba21+y7TRCdVZZ6/xAahJreEmJDn6BWXbDS0X2rkfqHCk8ah/dz7fCJtwNF4
+wrJMnJRKF4dEmaS+gP44B04SXO4vGlNQ/wuWaWXvDRAHqJewm0RRJgwhJIy/WnPA
+cvGhm1KZPyPOVy53ndH1AHdIGRxCMg7giDQhwRnvyvMKuDfNdiXOLdrO39fyo5J3
+BwIDAQABo4ICxDCCAsAwWQYDVR0gBFIwUDARBg8rBgEEAYGtIYIsAQEEAwQwEQYP
+KwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4w
+CAYGZ4EMAQICMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMB0GA1UdDgQWBBSOOi2L5LoOzpQGSjEMHoYo2cfS/zAfBgNVHSME
+GDAWgBQH1915iF9BccwW4dTH852yeLHdSDCBgAYDVR0RBHkwd4Ikc2hpYmJvbGV0
+aC1pZHAuYWRzLnVuaS1yZWdlbnNidXJnLmRlghdzaGliYm9sZXRoLWlkcC51bmkt
+ci5kZYIgc2hpYmJvbGV0aC1pZHAudW5pLXJlZ2Vuc2J1cmcuZGWCFHNoaWJib2xl
+dGgtaWRwLnVyLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBj
+YS5kZm4uZGUvdW5pLXJlZ2Vuc2J1cmctY2EvcHViL2NybC9jYWNybC5jcmwwQKA+
+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXJlZ2Vuc2J1cmctY2EvcHVi
+L2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMGCCsGAQUFBzABhido
+dHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXJlZ2Vuc2J1cmctY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3VuaS1yZWdlbnNidXJnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQsFAAOCAQEACrNp0LBp5RdEQ1kmAaxnY2ar+qhNbbD2b+qrSO47
+wgQJZzeKtO12SzMUNIJT/s2C4DN9Irc7YLrRX/pxneQ2Q4g8WhZb2qed3KdrQ5Om
+IJ3yaR8BMHUpeDQL5apE4jU18oKhlfFfaFcSajxad23L4HaFeQGbEtgpvAfhYeee
+m+fqaz3DlgdHL0vWjipIzOzODRo9R0t6OWnSFv5Yec6b4dZg3iSkf+pQavM7jGAi
+DX4hNvuSdqAQoshPOGkne5JWS+LZI7JffpNn+mWxdPb51iMUKTctcR/LGRPqQi5L
+p+8JChZ2pTZka2I2LRNae9c55NrpAChzn1jXzXtjCS8T5w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-regensburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-regensburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
diff --git a/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml
index 70df7097..3f090b11 100644
--- a/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml
@@ -9,7 +9,7 @@
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..abef3425
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cant-col.ac.uk/idp/shibboleth">
+  <!--
+		This is a "test" Shibboleth IdP for Canterbury College.
+	-->
+  <Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-04T14:23:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="274" width="88">https://shibboleth.cant-col.ac.uk/canterbury-college-logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shibboleth.cant-col.ac.uk/canterbury-college-logo-icon.png</mdui:Logo>
+        <mdui:Logo height="80" width="60">https://shibboleth.cant-col.ac.uk/canterbury-college-logo-cds.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Canterbury College (test)</mdui:DisplayName>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cant-col.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID3jCCAsYCCQD4z6zira6C7TANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
+						VUsxDTALBgNVBAgMBEtlbnQxEzARBgNVBAcMCkNhbnRlcmJ1cnkxGzAZBgNVBAoM
+						EkNhbnRlcmJ1cnkgQ29sbGVnZTEaMBgGA1UECwwRQ29tcHV0aW5nIFN1cHBvcnQx
+						IjAgBgNVBAMMGXNoaWJib2xldGguY2FudC1jb2wuYWMudWsxIDAeBgkqhkiG9w0B
+						CQEWEW5zQGNhbnQtY29sLmFjLnVrMB4XDTE2MDMyNDEwMDc0MloXDTIxMDMyMzEw
+						MDc0MlowgbAxCzAJBgNVBAYTAlVLMQ0wCwYDVQQIDARLZW50MRMwEQYDVQQHDApD
+						YW50ZXJidXJ5MRswGQYDVQQKDBJDYW50ZXJidXJ5IENvbGxlZ2UxGjAYBgNVBAsM
+						EUNvbXB1dGluZyBTdXBwb3J0MSIwIAYDVQQDDBlzaGliYm9sZXRoLmNhbnQtY29s
+						LmFjLnVrMSAwHgYJKoZIhvcNAQkBFhFuc0BjYW50LWNvbC5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBANL1WfdbMgBzfEOxwHeSK+MDNURlQWyV
+						aNSsn1KqEd13v+Ja/YwUyM0htgC95qFrRD2X2J6Vx1I8qTHJgyTr8nCz9iImV1uG
+						emG/skA2IKmkMVyfCX5DxQcmmiShm1b+cNW1fuJSxexUpUlHysJDMUeZnKIHUpug
+						qCabMwY7KmSMmcvT4+tn86Hh2xi2fDK/9stbiNo+5CAC8LA7FDQeQDiQaQyBmF6o
+						A5cSOq7/WA2lb+r/7LTznxWf3E4wCEQW3oaShETf9wJjC/wd0gFoyWKRz101xqW5
+						MqC8PgS4zcOkQuEIFTGPyAwnNYxKr67pqxsJIo+Ynq5TOUm4JHQJ6LcCAwEAATAN
+						BgkqhkiG9w0BAQUFAAOCAQEALKs+qNF+Z35LBada4feOxHMLiGq3qBLh4ULKzPrt
+						D5u4Xp1+4PGHWGkq5umdasnHcDH77T0jzFRCg3dGp6ZLF67SJjtPBC2Fg6n3QtGM
+						AvKTJHXQ4YOljSjVyXFtJjCJ4BLLBvld1WPWnJcI6d+hOM2AoWTGGIcZULxZjkk3
+						Vnfieg8hEskAqp9Ausr7zqgibczT83qM/JPTJmE4HygbhlE7AC8G3plV1Xx4Zdmq
+						U2lDsbpM9CoKDz+VeQbwhx4sIgu04JezZDJrtLEVWaf8Yx/CS7HoMNHrpH3bh+/O
+						eOGSNd/fcIupfbOlmBneWAsTPWNhQqts16hoEnHbf5t+3A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cant-col.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cant-col.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cant-col.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cant-col.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cant-col.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID3jCCAsYCCQD4z6zira6C7TANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
+						VUsxDTALBgNVBAgMBEtlbnQxEzARBgNVBAcMCkNhbnRlcmJ1cnkxGzAZBgNVBAoM
+						EkNhbnRlcmJ1cnkgQ29sbGVnZTEaMBgGA1UECwwRQ29tcHV0aW5nIFN1cHBvcnQx
+						IjAgBgNVBAMMGXNoaWJib2xldGguY2FudC1jb2wuYWMudWsxIDAeBgkqhkiG9w0B
+						CQEWEW5zQGNhbnQtY29sLmFjLnVrMB4XDTE2MDMyNDEwMDc0MloXDTIxMDMyMzEw
+						MDc0MlowgbAxCzAJBgNVBAYTAlVLMQ0wCwYDVQQIDARLZW50MRMwEQYDVQQHDApD
+						YW50ZXJidXJ5MRswGQYDVQQKDBJDYW50ZXJidXJ5IENvbGxlZ2UxGjAYBgNVBAsM
+						EUNvbXB1dGluZyBTdXBwb3J0MSIwIAYDVQQDDBlzaGliYm9sZXRoLmNhbnQtY29s
+						LmFjLnVrMSAwHgYJKoZIhvcNAQkBFhFuc0BjYW50LWNvbC5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBANL1WfdbMgBzfEOxwHeSK+MDNURlQWyV
+						aNSsn1KqEd13v+Ja/YwUyM0htgC95qFrRD2X2J6Vx1I8qTHJgyTr8nCz9iImV1uG
+						emG/skA2IKmkMVyfCX5DxQcmmiShm1b+cNW1fuJSxexUpUlHysJDMUeZnKIHUpug
+						qCabMwY7KmSMmcvT4+tn86Hh2xi2fDK/9stbiNo+5CAC8LA7FDQeQDiQaQyBmF6o
+						A5cSOq7/WA2lb+r/7LTznxWf3E4wCEQW3oaShETf9wJjC/wd0gFoyWKRz101xqW5
+						MqC8PgS4zcOkQuEIFTGPyAwnNYxKr67pqxsJIo+Ynq5TOUm4JHQJ6LcCAwEAATAN
+						BgkqhkiG9w0BAQUFAAOCAQEALKs+qNF+Z35LBada4feOxHMLiGq3qBLh4ULKzPrt
+						D5u4Xp1+4PGHWGkq5umdasnHcDH77T0jzFRCg3dGp6ZLF67SJjtPBC2Fg6n3QtGM
+						AvKTJHXQ4YOljSjVyXFtJjCJ4BLLBvld1WPWnJcI6d+hOM2AoWTGGIcZULxZjkk3
+						Vnfieg8hEskAqp9Ausr7zqgibczT83qM/JPTJmE4HygbhlE7AC8G3plV1Xx4Zdmq
+						U2lDsbpM9CoKDz+VeQbwhx4sIgu04JezZDJrtLEVWaf8Yx/CS7HoMNHrpH3bh+/O
+						eOGSNd/fcIupfbOlmBneWAsTPWNhQqts16hoEnHbf5t+3A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Canterbury College</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Canterbury College (test)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.cant-col.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Nathan</GivenName>
+    <SurName>Friend</SurName>
+    <EmailAddress>mailto:n.friend@canterburycollege.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Nathan</GivenName>
+    <SurName>Friend</SurName>
+    <EmailAddress>mailto:n.friend@canterburycollege.ac.uk</EmailAddress>
+  </ContactPerson>
+</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
deleted file mode 100644
index fb25dc38..00000000
--- a/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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="en">CROUS Poitiers - Etudiants</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoyOSswMjowMOxH66YAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MjkrMDI6MDCdGlMaAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ac-poitiers.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS Poitiers - 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://www.ac-poitiers.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>crous.informatique@crous-poitiers.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml
index 7ddc1b7c..ee0acece 100644
--- a/swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml
@@ -16,8 +16,8 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="de">FH Wiener Neustadt</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Applied Sciences Wiener Neustadt</mdui:DisplayName>
-        <mdui:Logo height="85" width="125">https://moodle2.fhwn.ac.at/bilder/logo.jpg</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://moodle2.fhwn.ac.at/bilder/favicon.ico</mdui:Logo>
+        <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>
diff --git a/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml
index fd4cf4bd..8b30e4d4 100644
--- a/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml
@@ -16,9 +16,9 @@
       <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 height="183" width="385">https://shibboleth.im.jku.at/logos/JKULogokurzWappenlinks.png</mdui:Logo>
-        <mdui:Logo height="40" width="80">https://shibboleth.im.jku.at/logos/jku_logo_80x40.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shibboleth.im.jku.at/logos/jku_logo_16x16.png</mdui:Logo>
+        <mdui:Logo width="385" height="183">https://shibboleth.im.jku.at/logos/JKULogokurzWappenlinks.png</mdui:Logo>
+        <mdui:Logo width="80" height="40">https://shibboleth.im.jku.at/logos/jku_logo_80x40.png</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://shibboleth.im.jku.at/logos/jku_logo_16x16.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml
index 276a2853..c755e49f 100644
--- a/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml
@@ -52,11 +52,6 @@ xFPbgi4ddFYuZxVpoGMVPYqWfmqX3PXTKVvkqyLns9Fs/wfXI7NBuxxnFPFZS1Y4
     <md:OrganizationURL xml:lang="en">http://www.insa-cvl.fr</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:EmailAddress>service-info@listes.insa-cvl.fr</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml
index 6e7cbcb8..04d42631 100644
--- a/swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:elab="http://eduserv.org.uk/labels" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.mcgill.ca/idp/shibboleth">
+<md:EntityDescriptor xmlns:elab="http://eduserv.org.uk/labels" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.mcgill.ca/idp/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-07-07T00:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml
deleted file mode 100644
index 8c6de095..00000000
--- a/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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.reitoria.unesp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml
deleted file mode 100644
index ae4c9509..00000000
--- a/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-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.unesp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.unesp.br-idp-shibboleth.xml
new file mode 100644
index 00000000..b6bf2e20
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.unesp.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://shibboleth.unesp.br/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                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 - Universidade Estadual Paulista</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">Unesp - Universidade Estadual Paulista</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Unesp - Universidade Estadual Paulista</mdui:Description>
+        <mdui:Description xml:lang="pt-br">Unesp - Universidade Estadual Paulista</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unesp.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unesp.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEBDCCAuwCAQAwDQYJKoZIhvcNAQEFBQAwgccxRzBFBgNVBAoTPlVuZXNwIC0g
+VW5pdmVyc2lkYWRlIEVzdGFkdWFsIFBhdWxpc3RhIEp1bGlvIGRlIE1lc3F1aXRh
+IEZpbGhvMQwwCgYDVQQLEwNHUkMxGzAZBgkqhkiG9w0BCQEWDGdyY0B1bmVzcC5i
+cjESMBAGA1UEBxMJU2FvIFBhdWxvMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNV
+BAYTAkJSMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuZXNwLmJyMB4XDTE2MDExOTE3
+MzM0NFoXDTE5MDExODE3MzM0NFowgccxRzBFBgNVBAoTPlVuZXNwIC0gVW5pdmVy
+c2lkYWRlIEVzdGFkdWFsIFBhdWxpc3RhIEp1bGlvIGRlIE1lc3F1aXRhIEZpbGhv
+MQwwCgYDVQQLEwNHUkMxGzAZBgkqhkiG9w0BCQEWDGdyY0B1bmVzcC5icjESMBAG
+A1UEBxMJU2FvIFBhdWxvMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
+MRwwGgYDVQQDExNzaGliYm9sZXRoLnVuZXNwLmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAzCFL61AFAQbFPjOkgYMfsXtlLSmZKtd8TzzY7NHFp104
+x618ugRD/wNeArZKIb/Su1bFp6695va2wCup/yy1jCJizhYfHFClwjWZL6yX7VBl
+QUzu2713431gtsKxvAbXkO7d5FRz3nFw6cIEXH9Kx2pwddYs2FzlJH4wdtvvQdbD
+aqOAJJeTfrmhwUrMmIMtcTb6iDBI35buReEZH0k5d/554swnzOwotKJS+C+1Mb6X
+isNaKzwHK7tn3DQ5M97/WXURAfZO70+pIAL09EdWFr+pjSLVxqAZaJWGIf/nUWJH
+w9rPXG7HivBZyjT66P5ZAmmvp/3XAhjcTcA7itUXPQIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQDMGWfCOJID4kBtZNsOK+FQxvuq3X/+DI1mRhA/3AwmMblj0Dm1DuI0
+KMdqaEoe4RJvD2vpJbsCyO0fZE/reA6XQeYpiIBjRz3fkJZOmJ+/RRavZnu/cRJP
+GdxQ0k6AbJ/BXMdLIL5fF1nCdfSxj2wlKGhq8KwGXReQN8NBukzjBVHgyrlP228V
+AaBcb1B9puJJTo7/JwJR0s8/eeUZU7N18LcyqVsZB0vSkOw8FZ44Q/r9kSVQapOe
+IddLgwQh5RHTTe38Xxu7ar37dDZDOM5GZPIw1Z8AOx46xF+vYWFx+aI1vVR1zOFV
+q0/uXG2icV7Ke+Ss1fXhDq35eQ4xxauY
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unesp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unesp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.unesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unesp.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.unesp.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unesp.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unesp.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEBDCCAuwCAQAwDQYJKoZIhvcNAQEFBQAwgccxRzBFBgNVBAoTPlVuZXNwIC0g
+VW5pdmVyc2lkYWRlIEVzdGFkdWFsIFBhdWxpc3RhIEp1bGlvIGRlIE1lc3F1aXRh
+IEZpbGhvMQwwCgYDVQQLEwNHUkMxGzAZBgkqhkiG9w0BCQEWDGdyY0B1bmVzcC5i
+cjESMBAGA1UEBxMJU2FvIFBhdWxvMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNV
+BAYTAkJSMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuZXNwLmJyMB4XDTE2MDExOTE3
+MzM0NFoXDTE5MDExODE3MzM0NFowgccxRzBFBgNVBAoTPlVuZXNwIC0gVW5pdmVy
+c2lkYWRlIEVzdGFkdWFsIFBhdWxpc3RhIEp1bGlvIGRlIE1lc3F1aXRhIEZpbGhv
+MQwwCgYDVQQLEwNHUkMxGzAZBgkqhkiG9w0BCQEWDGdyY0B1bmVzcC5icjESMBAG
+A1UEBxMJU2FvIFBhdWxvMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
+MRwwGgYDVQQDExNzaGliYm9sZXRoLnVuZXNwLmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAzCFL61AFAQbFPjOkgYMfsXtlLSmZKtd8TzzY7NHFp104
+x618ugRD/wNeArZKIb/Su1bFp6695va2wCup/yy1jCJizhYfHFClwjWZL6yX7VBl
+QUzu2713431gtsKxvAbXkO7d5FRz3nFw6cIEXH9Kx2pwddYs2FzlJH4wdtvvQdbD
+aqOAJJeTfrmhwUrMmIMtcTb6iDBI35buReEZH0k5d/554swnzOwotKJS+C+1Mb6X
+isNaKzwHK7tn3DQ5M97/WXURAfZO70+pIAL09EdWFr+pjSLVxqAZaJWGIf/nUWJH
+w9rPXG7HivBZyjT66P5ZAmmvp/3XAhjcTcA7itUXPQIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQDMGWfCOJID4kBtZNsOK+FQxvuq3X/+DI1mRhA/3AwmMblj0Dm1DuI0
+KMdqaEoe4RJvD2vpJbsCyO0fZE/reA6XQeYpiIBjRz3fkJZOmJ+/RRavZnu/cRJP
+GdxQ0k6AbJ/BXMdLIL5fF1nCdfSxj2wlKGhq8KwGXReQN8NBukzjBVHgyrlP228V
+AaBcb1B9puJJTo7/JwJR0s8/eeUZU7N18LcyqVsZB0vSkOw8FZ44Q/r9kSVQapOe
+IddLgwQh5RHTTe38Xxu7ar37dDZDOM5GZPIw1Z8AOx46xF+vYWFx+aI1vVR1zOFV
+q0/uXG2icV7Ke+Ss1fXhDq35eQ4xxauY
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unesp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Unesp - Universidade Estadual Paulista</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">Unesp - Universidade Estadual Paulista</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Unesp - Universidade Estadual Paulista</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">Unesp - Universidade Estadual Paulista</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unesp.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.unesp.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>GRC</md:SurName>
+    <md:EmailAddress>grc@unesp.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp-test.sams2.oup.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp-test.sams2.oup.com-shibboleth.xml
index 41d44367..6965a1a9 100644
--- a/swamid-interfederations-2.0/shibboleth2sp-test.sams2.oup.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp-test.sams2.oup.com-shibboleth.xml
@@ -89,6 +89,7 @@
     <OrganizationURL xml:lang="en">http://www.oup.com/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
+    <GivenName>Shibboleth Support</GivenName>
     <EmailAddress>mailto:ShibbolethSupport@oup.com</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
diff --git a/swamid-interfederations-2.0/shibboleth2sp.ios.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.ios.semcs.net-shibboleth.xml
new file mode 100644
index 00000000..f4c981ca
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2sp.ios.semcs.net-shibboleth.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.ios.semcs.net/shibboleth">
+  <!--
+		This is an "ios Shibboleth 2 SP" Shibboleth SP for Semantico Limited.
+	-->
+  <Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-01T17:31:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <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://shibboleth2sp.ios.semcs.net/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://shibboleth2sp.ios.semcs.net/Shibboleth.sso/Login" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID0jCCArqgAwIBAgIJAMXnSzQszPKAMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
+						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
+						VQQKEwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AuaW9zLnNlbWNz
+						Lm5ldDAeFw0xNTExMDcwOTMyMzNaFw0zNTExMDIwOTMyMzNaMGsxCzAJBgNVBAYT
+						AlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQK
+						EwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AuaW9zLnNlbWNzLm5l
+						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKezfolPR7LUR0ybuc+k
+						r0ukNjOC8i8gK/jIdwRtD+atxKPl8A70u7n1VK6L6FOIc0PzQDjbXSpnbiXzFR6p
+						VjZeRaD26HM0jO/Ay+CVnlvTJ1aSV7QYyvLeiXTBjGjpynkQg3tM0uaLFCPg/lQh
+						41JPb0KiYlwpPLXWYfhZowcddCkjcG4PJT35idLKMW14e62TbwXBKcMhJoFL5+qQ
+						6cZu3g6nosrdGiObtMLzNOvaPL6Fe7cOCOeqUjkPxjus/c/0GTb+nG3wab8Vg+yz
+						rIPiafN8x9ghDjPPrvAk2KmP6B2jKfg8cEURk/I/+xJi2PpZRzKbIDUR+vkS67wR
+						d2UCAwEAAaN5MHcwVgYDVR0RBE8wTYIbc2hpYmJvbGV0aDJzcC5pb3Muc2VtY3Mu
+						bmV0hi5odHRwczovL3NoaWJib2xldGgyc3AuaW9zLnNlbWNzLm5ldC9zaGliYm9s
+						ZXRoMB0GA1UdDgQWBBShAg8uyeZf4gR6yaU+f5smbQoAfjANBgkqhkiG9w0BAQUF
+						AAOCAQEApynAOguOlwgnYQltZTBeqrkw11mc6oWpTPNheiHLHmaekTD793y+3HNO
+						hMJHM/8uvcCYfQHZzMuIxaDldH0YZiFseFCuGPZpblagEYRhDPEdL9zuIZOBJ0jo
+						81OTT27yp+ky5lls9Osmrzn85OTuFMLfSRkyq5Yz2jVfbsgeFG8ouw7roaxRzGLo
+						TKzodl+uyX9+AuRk8pyMq1N3iOkoth8Zu44E67QMj5klvg8gjbHFgPuVYuhq83N+
+						ReOQ+FcpuO5hS7L0bhpYICYJYidKZFWCsEBrHYub2bDLlM57tbowVy/SPg65ftcv
+						3PPCuNuaSO0bOCP/EsX2q+VJZ4T0rg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Semantico Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">ios Shibboleth 2 SP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.iospress.nl/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IOS Press Customer Service</GivenName>
+    <EmailAddress>mailto:customerservice@iospress.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Semantico Service Desk</GivenName>
+    <EmailAddress>mailto:servicedesk@semantico.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbolethv3.ac-limoges.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbolethv3.ac-limoges.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..56837907
--- /dev/null
+++ b/swamid-interfederations-2.0/shibbolethv3.ac-limoges.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://shibbolethv3.ac-limoges.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-10T15:29:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-limoges.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Rectorat Limoges Test shib3</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACNUlEQVQoz32ST2iScRjHn9/vfdXXOfW113RJ09Y2xWXvDJLYkiIGRR1ih6AReIh1aF2COu1Q9Ic61W0xqE616LCglRdjh1ogdZhsWZTTzWzWmDLf+W5z6uvr++swoWbSc3y+z4fvA98vIoRAo5mKLGEEFMa93pa/97jhdTQh3Hsw/ex1nHeZ6yTU0GE+La6slg7xVvSPVA98SuQ+ziz/XN7AGO22Nvu6rV4n1xgQC5Xbo9OLqTxnaXK3myoVJZbM53ObjjbTtaGDRp1qG1AoyZduvqcxXDi7z9vJIYwojAiByNzK6FiUovDI9SM6hv4D3HkYiSWER3f7Xga/TUx+RwhVFbKxKY/cOqpntZdvTPH7LcODBwCABoCsUJqJZi4GeEaFCYCWofw+m92ml6Sq0aAxs0z/yfYXwXh21W0xMRgAFtIixrjbtbP2JaBiURbXpfxaWa2iAMDnsWKEFtJizaEsyQRA30RvARSFIp+zZUlZK1SO+fcY9BqdVkUAypJcA4wGDQKSyRUdu5oBoCxVBwc8fJe1IiscqwGArFBEhLB6ppa0p4NDGIfCiwBQrRIAePz8y9Dw5Pmrb+JJAQCCb5NYTXs6d9QcVBQaOO0cG//a1cEd9tksZmbrN0WBvXb21bvU7Gzm3Bk3jdG24O4/iYY/pI/3tZ3yO+wtOgUg9Wt9PDQ/HVnq6Wm9EuAbVCMUTj+diEklGTACAogQtVYV6Hed6G39X/nmfohCvggAHKt1Oox16m8MQ+kQHdNaCQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozNCswMjowMK744cYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzQrMDI6MDDfpVl6AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ac-limoges.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Personnel éducation national</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Rectorat Limoges Test shib3</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnel éducation national</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDVDCCAjygAwIBAgIVAIJ5CqGf8i3eeJ4z6EwaacBFom5OMA0GCSqGSIb3DQEB
+CwUAMCUxIzAhBgNVBAMMGnNoaWJib2xldGh2My5hYy1saW1vZ2VzLmZyMB4XDTE2
+MDMyMzEwNTI1MFoXDTM2MDMyMzEwNTI1MFowJTEjMCEGA1UEAwwac2hpYmJvbGV0
+aHYzLmFjLWxpbW9nZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDL9vE2es5LkQYmAl8ho3XEiaxNb9V67n5iIxJ7zwIj/vNHGg8juo1U3tZbY70D
+AHUzKDgtIu2f4mO46Rzpkj7LJThVpzlfq8E+PuOt+4HfIBbJEpmWjtIV2Atxr2p4
+ihCjolIPgKv3xpjvDuTKCKJmaryTT1lOzrpwnmnSPg9T7IQr5ospQsXDNIjNuub8
+r6/ELxrGoLlrh2gf30SeSK/+smcL7zT3wyyZaT07gCilq20i1KeR/4HiJuAIvY7F
+KrHqzAO/yOoSyqXBOz3rnmwrKUMSKg4nZGJJHeRE/IKjuT+4Sye38nwEGHkVl8Qy
+oQU0V0kmc2ZJVjMWiEVLYxptAgMBAAGjezB5MB0GA1UdDgQWBBS/Pu8LmqS18Cbe
+JLPvl4VbUM/TZDBYBgNVHREEUTBPghpzaGliYm9sZXRodjMuYWMtbGltb2dlcy5m
+coYxaHR0cHM6Ly9zaGliYm9sZXRodjMuYWMtbGltb2dlcy5mci9pZHAvc2hpYmJv
+bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAega66//txkNh0uAvMYos3wZxmYxPFdbr
+lzZIfp4X148v4fqZQJID/4oamnBY5v3t8M2UcskygHMj/2N13CRJf5WGsZQwJ+2Y
+w/HEbFqHJxnm1InpvGV4ICX/WT/rlfkZ3XiDG4/iv9SUxDanGN8QL0BB2sIv/en7
+EmIQZeG+ZQqerErfzzH6QYl6KZpNpvQKYY5u/PskHO9IxKixVf6vbyTIqHZOzhc0
+b4wzF3bsYpMFytKm/s30eB0y4TFS8yJenO3Hs0h/RVXJc5hyzeoFduTIM8/Caroc
+nny0Gc5o3vE90Pel8WhL9uZht7coxWkn7V349ALZl4yKygo5tKbhSQ==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbolethv3.ac-limoges.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbolethv3.ac-limoges.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbolethv3.ac-limoges.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Rectorat Limoges Test shib3</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Rectorat Limoges Test shib3</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ac-limoges.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>l.das-ie@ac-limoges.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibdev2.stir.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibdev2.stir.ac.uk-idp-shibboleth.xml
index 17f2b309..12cf4594 100644
--- a/swamid-interfederations-2.0/shibdev2.stir.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibdev2.stir.ac.uk-idp-shibboleth.xml
@@ -43,44 +43,6 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <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>
-    </KeyDescriptor>
     <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"/>
     <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"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -120,44 +82,6 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <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>
-    </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev2.stir.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev2.stir.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
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
deleted file mode 100644
index cb97e1d8..00000000
--- a/swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.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/shibsp.test.openathens.net-shibboleth.xml b/swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml
deleted file mode 100644
index fdfdc884..00000000
--- a/swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibsp.test.openathens.net/shibboleth">
-  <!--
-		This is a Test Shibboleth SP for Eduserv.
-	-->
-  <Extensions>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.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"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <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://shibsp.test.openathens.net/Shibboleth.sso/Login"/>
-    </Extensions>
-    <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>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsp.test.openathens.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <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"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv Test Shibboleth SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/si-saai.ualg.pt-idp-shibboleth.xml b/swamid-interfederations-2.0/si-saai.ualg.pt-idp-shibboleth.xml
new file mode 100644
index 00000000..72f536b0
--- /dev/null
+++ b/swamid-interfederations-2.0/si-saai.ualg.pt-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://si-saai.ualg.pt/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.fccn.pt" registrationInstant="2010-01-22T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ualg.pt</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Algarve</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt">Universidade do Algarve</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ualg.pt/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt">http://www.ualg.pt/pt</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUKuW5MuiehKHHdGjp+5rQDbXzx4IwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPc2ktc2FhaS51YWxnLnB0MB4XDTE2MDIwMTA5MTQwNFoX
+DTM2MDIwMTA5MTQwNFowGjEYMBYGA1UEAxMPc2ktc2FhaS51YWxnLnB0MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApN/x2BG+tpJBXU+bPSReXt1V+kaS
+oH1zAbA62ckYhHM6VqlzrqCD5ZCErMt5ysc9jpvJZ9umze1hXRaIYbGHCc3ADfBg
+rXoedBO7P10psRAuZqXOzvBwD7Dkb25KHTo/si3ZFB5VMUAMzHdxNWlOyhkOOS++
+hY5sq21iTGy5qDxsFBmHxGFv0oZYMgB6ZFWwScX1GyD6YpnbqBrlvdzmCmtBmGxy
+VV/ReyY5dK03bbDiF5Hf2mQR24ORQ5VrsbwlRyPtjVcWSilEJOB0PVOoixewA07R
+BzCQTeGeC3trM9ZobVuOavDxGN6rxzWnhe0DE2+sTqARxsKOY5kgMkM4kwIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9zaS1zYWFpLnVhbGcucHSGJmh0dHBzOi8vc2ktc2Fh
+aS51YWxnLnB0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTfBNAJjRTcPNuPowmL
+Q3a0hqaSKTANBgkqhkiG9w0BAQUFAAOCAQEAkP4lZzeVslQLxLFZWCVVcNh9LuGg
+sGuiVru8GUH63zNrrzwAyhlSXyXU+61Yn1MxFnx+Bn2zf9qG1UMmf6FFFyxYFCHN
+1iuo6P0DIkJgpvLo+qoRbYJxB552ZFeF/g8AvhUU910LFLQOHJzrfsrF9hJM2gAi
+nZDbmjY7IsP1f9iLm5aP6tCSszjkEbWzsnweQMBlteNa/2m9Ncfb4TpRwvcViCW7
+7uv/13bbYB4F4pTr6fVxqORhM7HSJYn6WkgZczGbCFUMaIfTxKSF9v7/bpHnbXIP
+8YekuHRId7rJxQiwaGni69uLUvfjTo4cRrDa6daZo2Ff1LlKlfjTN4ANRA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://si-saai.ualg.pt/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://si-saai.ualg.pt/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://si-saai.ualg.pt/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://si-saai.ualg.pt/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="pt">Universidade do Algarve</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Algarve</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="pt">Universidade do Algarve</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Algarve</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="pt">http://www.ualg.pt/pt</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.ualg.pt/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adriano</md:GivenName>
+    <md:SurName>Pires</md:SurName>
+    <md:EmailAddress>mailto:helpmail@ualg.pt</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Suporte</md:GivenName>
+    <md:SurName>Serviços de Informática da Ualg</md:SurName>
+    <md:EmailAddress>mailto:helpmail@ualg.pt</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml
index 5fb83bec..1c9f028c 100644
--- a/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml
@@ -16,8 +16,8 @@
         <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:Logo xml:lang="sv" height="116" width="350">https://signon.hh.se/hh-logo-sv-350x116.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="116" width="350">https://signon.hh.se/hh-logo-en-350x116.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">http://signon.hh.se/idp_privacy_statement.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://signon.hh.se/idp_privacy_statement_en.html</mdui:PrivacyStatementURL>
         <mdui:Keywords xml:lang="sv">hh hh.se hogskolan+i+halmstad halmstad+university</mdui:Keywords>
diff --git a/swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml b/swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml
index 1859c2d1..299949d1 100644
--- a/swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml
@@ -5,7 +5,7 @@
       <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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
diff --git a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
index c254fe4a..01778ca8 100644
--- a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -9,7 +9,7 @@
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/sp.clarin.si-.xml b/swamid-interfederations-2.0/sp.clarin.si-.xml
index fa799b26..4e5fa809 100644
--- a/swamid-interfederations-2.0/sp.clarin.si-.xml
+++ b/swamid-interfederations-2.0/sp.clarin.si-.xml
@@ -9,7 +9,7 @@
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
index 52aedcb8..19213382 100644
--- a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
@@ -7,9 +7,9 @@
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml
index 0b38d21e..ce2b2011 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml
@@ -11,7 +11,7 @@
       <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:Logo height="161" width="350">https://auth.edina.ac.uk/public/images/splogos/agcensus.png</mdui:Logo>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml
index 44731f18..ab3c7aaa 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml
@@ -14,7 +14,7 @@
       <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://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/UKDA"/>
       <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://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/EDINASchools"/>
       <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://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/UKFederation"/>
-      <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://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/UKall"/>
+      <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://auth.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>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
index 459cf0d0..cc8cd9e2 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
@@ -16,7 +16,7 @@
       <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:Logo height="65" width="150">https://auth.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
index 66955fb4..4143334b 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
@@ -11,7 +11,7 @@
       <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:Logo height="84" width="350">https://auth.edina.ac.uk/public/images/splogos/mediahub.png</mdui:Logo>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml
index 71a3c272..62d28ff8 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml
@@ -16,7 +16,7 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">SafeNet</mdui:DisplayName>
         <mdui:Description xml:lang="en">SafeNet</mdui:Description>
-        <mdui:Logo height="65" width="150">https://vsp2.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
+        <mdui:Logo height="65" width="150">https://auth.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
index 8768ef58..8ad7ae10 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
@@ -11,7 +11,7 @@
       <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:Logo height="161" width="350">https://auth.edina.ac.uk/public/images/splogos/ukborders.png</mdui:Logo>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
diff --git a/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml
index 3547693a..f4069146 100644
--- a/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml
@@ -11,7 +11,7 @@
       <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:Logo height="100" width="350">https://auth.edina.ac.uk/public/images/splogos/gogeo.png</mdui:Logo>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
index 2bfb5f38..58b8da7a 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -9,7 +9,7 @@
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml b/swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml
index cd9a8634..a33b93ce 100644
--- a/swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml
@@ -5,7 +5,7 @@
       <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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
@@ -97,11 +97,11 @@ IznEEJKY8IltpfdkKGE20g==
     <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:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml b/swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml
index ba376973..f2f597cb 100644
--- a/swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml
+++ b/swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml
@@ -8,7 +8,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0: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://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml b/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml
index 85b7a5a0..8c70b7d5 100644
--- a/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml
+++ b/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml
@@ -4,6 +4,11 @@
     <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>
@@ -11,11 +16,11 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="fi">Kielipankki</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Kielipankki (The Language Bank of Finland)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Web portal of the Language Bank of Finland</mdui:Description>
         <mdui:Description xml:lang="fi">Kielipankin portaali</mdui:Description>
-        <mdui:Logo height="80" width="170">https://www.kielipankki.fi/wp-content/uploads/KIELIPANKKI_logo_RGB_2000dpi.png</mdui:Logo>
-        <mdui:Keywords xml:lang="fi">Kielipankki, portaali, keskustelufoorumi</mdui:Keywords>
+        <mdui:Description xml:lang="en">Web portal of the Language Bank of Finland</mdui:Description>
+        <mdui:Logo height="58" width="300">https://www.kielipankki.fi/wp-content/uploads/KIELIPANKKI_logotxt_SU_EN.png</mdui:Logo>
         <mdui:Keywords xml:lang="en">Language Bank, Portal, discussion forum</mdui:Keywords>
+        <mdui:Keywords xml:lang="fi">Kielipankki, portaali, keskustelufoorumi</mdui:Keywords>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.kielipankki.fi/privacy-policy/</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">https://www.kielipankki.fi/tietosuojaseloste/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
@@ -68,11 +73,12 @@ ukUJvoKA4qzHcF2rQn4=</ds:X509Certificate>
       <md:ServiceName xml:lang="en">Kielipankki (The Language Bank of Finland)</md:ServiceName>
       <md:ServiceDescription xml:lang="fi">Kielipankin portaali</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Web portal of the Language Bank of Finland</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml
index 4eb380e1..3fb784c1 100644
--- a/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml
@@ -14,30 +14,44 @@
       <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
+						MIIHADCCBeigAwIBAgIULRvMHnjL6D0AX5xModcnwU4/M9gwDQYJKoZIhvcNAQEL
+						BQAwSTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+						BgNVBAMTFlF1b1ZhZGlzIEVWIFNTTCBJQ0EgRzEwHhcNMTYwNDAxMTIxNzI0WhcN
+						MTgwNDAxMTIyNzAwWjCB6zETMBEGCysGAQQBgjc8AgEDEwJHQjEaMBgGA1UEDwwR
+						R292ZXJubWVudCBFbnRpdHkxLjAsBgNVBAUTJUZ1cnRoZXIgYW5kIEhpZ2hlciBF
+						ZHVjYXRpb24gQWN0IDE5OTIxCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5HcmVhdGVy
+						IExvbmRvbjEPMA0GA1UEBwwGTE9ORE9OMScwJQYDVQQKDB5LZW5zaW5ndG9uIGFu
+						ZCBDaGVsc2VhIENvbGxlZ2UxEDAOBgNVBAsMB0lUIERlcHQxFjAUBgNVBAMMDXNw
+						Mi5rY2MuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjVvNL
+						oDJvVsyC+PAOr0XVIXPURXi3nYwSEUSwEnOx1anJL3eFhAR3hPLX50cW9j6nvS/i
+						Uj/GgpbzJoNjK/t01UV/5e0kNizLcXS/LJlGRONjwjqzhRiccGCTEIj9tFhsD3Kg
+						7D67uCniXKlg6hIoKBf1prinGwiAoxjsIEoMIQVyiL1bmvwR9neO+CrhKMwMGFJk
+						TwyOFANebp5/m6kSND8FrW+BIRBnLTzH7oCnIwuMIcDxVZYmrCEoU+NWtJQgLkkT
+						RI1gMeiWV35i6uuDBi3UhWD5+Dwtj2c8OHUfbJeQKExVhxVuySBvsus7phndiCtb
+						MhcfYd+bQigC4KfvAgMBAAGjggM7MIIDNzB3BggrBgEFBQcBAQRrMGkwOAYIKwYB
+						BQUHMAKGLGh0dHA6Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5jb20vcXZldnNzbDEu
+						Y3J0MC0GCCsGAQUFBzABhiFodHRwOi8vZXYub2NzcC5xdW92YWRpc2dsb2JhbC5j
+						b20wHQYDVR0OBBYEFMfXwT/odsQn/Qh+84DwXb+f1nyUMAwGA1UdEwEB/wQCMAAw
+						HwYDVR0jBBgwFoAUVViGzrp8dk6ZE6kP02yfwvXTPOMwUQYDVR0gBEowSDBGBgwr
+						BgEEAb5YAAJkAQIwNjA0BggrBgEFBQcCARYoaHR0cDovL3d3dy5xdW92YWRpc2ds
+						b2JhbC5jb20vcmVwb3NpdG9yeTA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3Js
+						LnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdmV2c3NsMS5jcmwwDgYDVR0PAQH/BAQDAgWg
+						MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAsBgNVHREEJTAjgg1zcDIu
+						a2NjLmFjLnVrghJwYXNzd29yZC5rY2MuYWMudWswggF/BgorBgEEAdZ5AgQCBIIB
+						bwSCAWsBaQB3AGj2mPgfZIK+OozuuSgdTPxxUV1nk9RE0QpnrLtPT/vEAAABU9HK
+						2SgAAAQDAEgwRgIhAPKH35oW8AoBlpg6UUzCwOEWOoOEJFjggHopL5ff9UrfAiEA
+						uyz1xiydQkVmtoVLIy3cWf48filugtOkuLtGQLecO9cAdgCkuQmQtBhYFIe7E6LM
+						Z3AKPDWYBPkb37jjd80OyA3cEAAAAVPRytvSAAAEAwBHMEUCIBrIZrxXF1YWyFan
+						LokPH3a6gkpOqKe0iwrXN51ePR0mAiEAhWPuzwSkHCckHz0pS8Tx+paMLYpOanxU
+						DHjwm7KI9lwAdgBWFAaaL9fC7NP14b1Esj7HRna5vJkRXMDvlJhV1onQ3QAAAVPR
+						yuBOAAAEAwBHMEUCIQD3RTS4nUhCj0KfCxXnqQwyLGNs3C9tebWykvR++mqXrAIg
+						QeRmlL9ep8uotPJH5vu6aetiINHpEgytEXmzlXZtmWUwDQYJKoZIhvcNAQELBQAD
+						ggEBAFF474gBUWeH9MSHtzL2Mi96SGRlmm+YOamojWDXkUz1c6gyLnzrLKSrvZaB
+						h5gYKz/cMBJudOhdP5+tbd66z3+S7uoMiKd/ls/E4gIiQ+Cwu4nkiL5MF1S0vAKP
+						U5XXA8ANLRPxWloa361OxO/Yl3GXPcxEjT2UdR6p90jxzCx0cKPs7pzYZCirK6l8
+						/eo6GJKz78I/mC/QRE5/BVQNkIHHin5ifefXEz8iWmK0ssyeVX0XM2SS3cejuYTe
+						vvTm3eqQfCh9LxneNPZZ911fnN2nKExJWkLcuv89TaFyktIPYL3Hsg+tdaaKFsbM
+						fq7V+we0vhHSHgskNFgy9NRL0mk=
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -59,30 +73,44 @@
       <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
+						MIIHADCCBeigAwIBAgIULRvMHnjL6D0AX5xModcnwU4/M9gwDQYJKoZIhvcNAQEL
+						BQAwSTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+						BgNVBAMTFlF1b1ZhZGlzIEVWIFNTTCBJQ0EgRzEwHhcNMTYwNDAxMTIxNzI0WhcN
+						MTgwNDAxMTIyNzAwWjCB6zETMBEGCysGAQQBgjc8AgEDEwJHQjEaMBgGA1UEDwwR
+						R292ZXJubWVudCBFbnRpdHkxLjAsBgNVBAUTJUZ1cnRoZXIgYW5kIEhpZ2hlciBF
+						ZHVjYXRpb24gQWN0IDE5OTIxCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5HcmVhdGVy
+						IExvbmRvbjEPMA0GA1UEBwwGTE9ORE9OMScwJQYDVQQKDB5LZW5zaW5ndG9uIGFu
+						ZCBDaGVsc2VhIENvbGxlZ2UxEDAOBgNVBAsMB0lUIERlcHQxFjAUBgNVBAMMDXNw
+						Mi5rY2MuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjVvNL
+						oDJvVsyC+PAOr0XVIXPURXi3nYwSEUSwEnOx1anJL3eFhAR3hPLX50cW9j6nvS/i
+						Uj/GgpbzJoNjK/t01UV/5e0kNizLcXS/LJlGRONjwjqzhRiccGCTEIj9tFhsD3Kg
+						7D67uCniXKlg6hIoKBf1prinGwiAoxjsIEoMIQVyiL1bmvwR9neO+CrhKMwMGFJk
+						TwyOFANebp5/m6kSND8FrW+BIRBnLTzH7oCnIwuMIcDxVZYmrCEoU+NWtJQgLkkT
+						RI1gMeiWV35i6uuDBi3UhWD5+Dwtj2c8OHUfbJeQKExVhxVuySBvsus7phndiCtb
+						MhcfYd+bQigC4KfvAgMBAAGjggM7MIIDNzB3BggrBgEFBQcBAQRrMGkwOAYIKwYB
+						BQUHMAKGLGh0dHA6Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5jb20vcXZldnNzbDEu
+						Y3J0MC0GCCsGAQUFBzABhiFodHRwOi8vZXYub2NzcC5xdW92YWRpc2dsb2JhbC5j
+						b20wHQYDVR0OBBYEFMfXwT/odsQn/Qh+84DwXb+f1nyUMAwGA1UdEwEB/wQCMAAw
+						HwYDVR0jBBgwFoAUVViGzrp8dk6ZE6kP02yfwvXTPOMwUQYDVR0gBEowSDBGBgwr
+						BgEEAb5YAAJkAQIwNjA0BggrBgEFBQcCARYoaHR0cDovL3d3dy5xdW92YWRpc2ds
+						b2JhbC5jb20vcmVwb3NpdG9yeTA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3Js
+						LnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdmV2c3NsMS5jcmwwDgYDVR0PAQH/BAQDAgWg
+						MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAsBgNVHREEJTAjgg1zcDIu
+						a2NjLmFjLnVrghJwYXNzd29yZC5rY2MuYWMudWswggF/BgorBgEEAdZ5AgQCBIIB
+						bwSCAWsBaQB3AGj2mPgfZIK+OozuuSgdTPxxUV1nk9RE0QpnrLtPT/vEAAABU9HK
+						2SgAAAQDAEgwRgIhAPKH35oW8AoBlpg6UUzCwOEWOoOEJFjggHopL5ff9UrfAiEA
+						uyz1xiydQkVmtoVLIy3cWf48filugtOkuLtGQLecO9cAdgCkuQmQtBhYFIe7E6LM
+						Z3AKPDWYBPkb37jjd80OyA3cEAAAAVPRytvSAAAEAwBHMEUCIBrIZrxXF1YWyFan
+						LokPH3a6gkpOqKe0iwrXN51ePR0mAiEAhWPuzwSkHCckHz0pS8Tx+paMLYpOanxU
+						DHjwm7KI9lwAdgBWFAaaL9fC7NP14b1Esj7HRna5vJkRXMDvlJhV1onQ3QAAAVPR
+						yuBOAAAEAwBHMEUCIQD3RTS4nUhCj0KfCxXnqQwyLGNs3C9tebWykvR++mqXrAIg
+						QeRmlL9ep8uotPJH5vu6aetiINHpEgytEXmzlXZtmWUwDQYJKoZIhvcNAQELBQAD
+						ggEBAFF474gBUWeH9MSHtzL2Mi96SGRlmm+YOamojWDXkUz1c6gyLnzrLKSrvZaB
+						h5gYKz/cMBJudOhdP5+tbd66z3+S7uoMiKd/ls/E4gIiQ+Cwu4nkiL5MF1S0vAKP
+						U5XXA8ANLRPxWloa361OxO/Yl3GXPcxEjT2UdR6p90jxzCx0cKPs7pzYZCirK6l8
+						/eo6GJKz78I/mC/QRE5/BVQNkIHHin5ifefXEz8iWmK0ssyeVX0XM2SS3cejuYTe
+						vvTm3eqQfCh9LxneNPZZ911fnN2nKExJWkLcuv89TaFyktIPYL3Hsg+tdaaKFsbM
+						fq7V+we0vhHSHgskNFgy9NRL0mk=
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -98,9 +126,9 @@
     <OrganizationURL xml:lang="en">http://www.kcc.ac.uk/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
-    <GivenName>Leslie-Ann</GivenName>
-    <SurName>Campbell</SurName>
-    <EmailAddress>mailto:l.campbell@kcc.ac.uk</EmailAddress>
+    <GivenName>Tony</GivenName>
+    <SurName>Jack</SurName>
+    <EmailAddress>mailto:t.jack@kcc.ac.uk</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <GivenName>Richard</GivenName>
diff --git a/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml b/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml
index e58480e2..57021817 100644
--- a/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml
@@ -73,6 +73,7 @@ Vxp7Cw9zAwVPssgq6AhWp6csK/qRVeLsS4etFKHriK1UoC4PUhpqWkMr+bblM1hA
       <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute FriendlyName="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
diff --git a/swamid-interfederations-2.0/srv-idp-01.uffs.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/srv-idp-01.uffs.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..acfe96bd
--- /dev/null
+++ b/swamid-interfederations-2.0/srv-idp-01.uffs.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://srv-idp-01.uffs.edu.br/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                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">UFFS - Universidade Federal da Fronteira Sul</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFFS - Universidade Federal da Fronteira Sul</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFFS - Universidade Federal da Fronteira Sul</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFFS - Universidade Federal da Fronteira Sul</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uffs.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uffs.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIECjCCAvICAQAwDQYJKoZIhvcNAQEFBQAwgcoxNTAzBgNVBAoTLFVGRlMgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkYSBGcm9udGVpcmEgU3VsMQ0wCwYDVQQLEwRE
+SVRJMSgwJgYJKoZIhvcNAQkBFhlqb25lcy5tdW5lcm9uQHVmZnMuZWR1LmJyMREw
+DwYDVQQHFAhDaGFwZWPDszEXMBUGA1UECBMOU2FudGEgQ2F0YXJpbmExCzAJBgNV
+BAYTAkJSMR8wHQYDVQQDExZzcnYtaWRwLTAxLnVmZnMuZWR1LmJyMB4XDTE2MDIw
+MzE1NDQxNloXDTE5MDIwMjE1NDQxNlowgcoxNTAzBgNVBAoTLFVGRlMgLSBVbml2
+ZXJzaWRhZGUgRmVkZXJhbCBkYSBGcm9udGVpcmEgU3VsMQ0wCwYDVQQLEwRESVRJ
+MSgwJgYJKoZIhvcNAQkBFhlqb25lcy5tdW5lcm9uQHVmZnMuZWR1LmJyMREwDwYD
+VQQHFAhDaGFwZWPDszEXMBUGA1UECBMOU2FudGEgQ2F0YXJpbmExCzAJBgNVBAYT
+AkJSMR8wHQYDVQQDExZzcnYtaWRwLTAxLnVmZnMuZWR1LmJyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEArWzgA4wVwKS6FhzHab8+jUayxzDB7P13Kd0I
+pfHKHgpa25y4Z+D97P53Ohx5Qe+8dag2FPUc0/ErepsVt15zD/j4Ulj5IZO1Z3ds
+HqBBlKm5wkiIcEXgV7OQthcdMzVaZ5tipjrNsSEOEGWuOiqPizM/QplH0QFCygfb
+1Zzjyd4fQVbc9FcmjM5sBfMLemwFn13eWHtl1RAP3rCe0u4dkA+74kbVccn6MWC3
+bW6a23JrrYq0hsF3TwLeC2J4j67Po9FHKsMYm0xja/5jkQhvtr6dR9xq44jKVVUy
+mmHupBetA+9EJlb84Os7OON0mYI8CDtX5evBbBlKJjLJUkm9IwIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQCAMdMg6UP6yGYTyeid6RQIZ4GaAquU2sa2wKlsRq/a3blx
+NkGmccyo8xpDoe42Jg7wAhbqryGOPLxtbiShV2kdb5BlQqBvLf4ZnHWrPX7TGDSu
+2aispse2LSlrGdBjt7KS6mv5HjOY362uUjisIi6OA1Tjp9Z0bXf3WeGr1fCO9tMl
+DvjbzZBUvsRdNusIgU9QBTZ3kS+SbZzcHsT3VCykunwGac7FYD7iCMX61iZNemBA
+B55GcBRKlaKXvMOUhzba07OZuOBjee8bd+huiHoW7WaMc6Nux/0/u80VrW1Idsl4
+HMcqUsuZRz3fIkrDrt4eyyxzNMyQv3rMNhv8gc6z
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srv-idp-01.uffs.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srv-idp-01.uffs.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://srv-idp-01.uffs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv-idp-01.uffs.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srv-idp-01.uffs.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv-idp-01.uffs.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIECjCCAvICAQAwDQYJKoZIhvcNAQEFBQAwgcoxNTAzBgNVBAoTLFVGRlMgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkYSBGcm9udGVpcmEgU3VsMQ0wCwYDVQQLEwRE
+SVRJMSgwJgYJKoZIhvcNAQkBFhlqb25lcy5tdW5lcm9uQHVmZnMuZWR1LmJyMREw
+DwYDVQQHFAhDaGFwZWPDszEXMBUGA1UECBMOU2FudGEgQ2F0YXJpbmExCzAJBgNV
+BAYTAkJSMR8wHQYDVQQDExZzcnYtaWRwLTAxLnVmZnMuZWR1LmJyMB4XDTE2MDIw
+MzE1NDQxNloXDTE5MDIwMjE1NDQxNlowgcoxNTAzBgNVBAoTLFVGRlMgLSBVbml2
+ZXJzaWRhZGUgRmVkZXJhbCBkYSBGcm9udGVpcmEgU3VsMQ0wCwYDVQQLEwRESVRJ
+MSgwJgYJKoZIhvcNAQkBFhlqb25lcy5tdW5lcm9uQHVmZnMuZWR1LmJyMREwDwYD
+VQQHFAhDaGFwZWPDszEXMBUGA1UECBMOU2FudGEgQ2F0YXJpbmExCzAJBgNVBAYT
+AkJSMR8wHQYDVQQDExZzcnYtaWRwLTAxLnVmZnMuZWR1LmJyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEArWzgA4wVwKS6FhzHab8+jUayxzDB7P13Kd0I
+pfHKHgpa25y4Z+D97P53Ohx5Qe+8dag2FPUc0/ErepsVt15zD/j4Ulj5IZO1Z3ds
+HqBBlKm5wkiIcEXgV7OQthcdMzVaZ5tipjrNsSEOEGWuOiqPizM/QplH0QFCygfb
+1Zzjyd4fQVbc9FcmjM5sBfMLemwFn13eWHtl1RAP3rCe0u4dkA+74kbVccn6MWC3
+bW6a23JrrYq0hsF3TwLeC2J4j67Po9FHKsMYm0xja/5jkQhvtr6dR9xq44jKVVUy
+mmHupBetA+9EJlb84Os7OON0mYI8CDtX5evBbBlKJjLJUkm9IwIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQCAMdMg6UP6yGYTyeid6RQIZ4GaAquU2sa2wKlsRq/a3blx
+NkGmccyo8xpDoe42Jg7wAhbqryGOPLxtbiShV2kdb5BlQqBvLf4ZnHWrPX7TGDSu
+2aispse2LSlrGdBjt7KS6mv5HjOY362uUjisIi6OA1Tjp9Z0bXf3WeGr1fCO9tMl
+DvjbzZBUvsRdNusIgU9QBTZ3kS+SbZzcHsT3VCykunwGac7FYD7iCMX61iZNemBA
+B55GcBRKlaKXvMOUhzba07OZuOBjee8bd+huiHoW7WaMc6Nux/0/u80VrW1Idsl4
+HMcqUsuZRz3fIkrDrt4eyyxzNMyQv3rMNhv8gc6z
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srv-idp-01.uffs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srv-idp-01.uffs.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFFS - Universidade Federal da Fronteira Sul</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFFS - Universidade Federal da Fronteira Sul</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFFS - Universidade Federal da Fronteira Sul</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFFS - Universidade Federal da Fronteira Sul</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uffs.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.uffs.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jones J. Muneron</md:SurName>
+    <md:EmailAddress>jones.muneron@uffs.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml
index a9c8b8f1..8468c963 100644
--- a/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml
@@ -16,10 +16,10 @@
         <mdui:Description xml:lang="fr">Fournisseur d'Identité IAM pour les utilisateurs du Ministère de l'Éducation nationale</mdui:Description>
         <mdui:Description xml:lang="de">Identitätsprovider für die IAM Nutzer des Ministeriums für Bildung</mdui:Description>
         <mdui:Keywords xml:lang="en">IAM CGIE MENJE luxembourg user users login education</mdui:Keywords>
-        <mdui:Logo height="16" width="16" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0DN9GR/zoAAAEZSURBVDjLndO9SgNBFAXgb0OwFythOxf8IY2ljaQRax/Al7AUQfRRfAAbCxHTCEIQLEVUIiikXbATDDE2WbkZRghON3PmnHvuuTNFXVZn2Pe/dVvUZTXBBEUA0r2/7rSmmyIcxotf+Ax3GvyX004UG+AdPTxjhFV0sZa6aSc2C/RxvDQcXEegLqstnGAnttJKFN9yZFgaDvo4xEN0nGZw05DrsorVG5F7XEZOKxQZ4SlUjNWj4CM+0hYaS+M5Zv8dAp8RWJimLddCcLSOxVyI0K3LajvajuS6rDrYjZzmJcZJ9HCEu0CEDk6xNzP3jAC84gAX0/MNnIcWJ7kpxKe6gs2AL+fIuQyKAI6T5GX+jRauMj9vnlXg5QcATWTFHAxLwAAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0EFUuwKBkAAASRSURBVGje7ZpLjxRlFIaft6Z1JgoZkm7AgdKg02JUMKIbo1ujiQlRkSAiiRsJ6B/QhXGhW1f+ATQBE5SAstGFt40JMSLBEF1YiGi1w8gUlxHkMsO8Lqr6IghUT1e304Rv2zXd3/Od77znnLdGSTgqm1ckbTGsxEYSc3zNAOOYN4Ad5Vp0JsDaLOkp4E7B3IewMciwAHkL8DyAkrB6ALgLmAc4e3wu0xiQDdmZ78TeWAIeyEj74k5lEM52KmAY6cGg+XE/MLRu1c0IGZdaP6d/li7ZrgOukxUUnIS++gNufXbOgly2O192H9QNBgBKhQg7km1Jwhihc8BJQQ2YAgaBYUMZa1h1pksk9f8Ayfbb0JCLoEnsU5JqwFHbY0I/IM4C84ERYJnEcswS4FZgQXYr1GkNK836Ekmt5xhLfAzaCRzETAIDWSvRvFk2FsOSVgKrgfXAkiKCUppFJEAoq58XgG3AHpv9EuPlODrf0g/910omwupewRHgc2AjsNpovjogKrWbCwhsIYiBD4EPynG0r50frcTROeAwcDgJR08YJgRrQCFpH2W1ec3yg1hC6WlJjAG7bV6r1KLpTpK0HB/amyytHkKeAjYAI0phUBvRyS+/zXSctr0VeL1TiAZMLTpm9BbwCfDnbDI+yJ/daYoD2wS7ynH0d5F1oBJHk8bvAl91syDWO87fDTuQ9nejqFXiQz8BnwK/ZMqSu4IGOSLhVKFIgD2CA+U4muni3PS1YSswozTli8wRAZwAPjOc6mbzV6lFRwRfAmdThXQhV0tN8WAC2FspODeusMaA7+owhUTEWRW3/Uc5jiZ61JVfAA5gTisnSZBHrwTjkn7r4VA+BRxDTBWiWvXqZ3sc+LV3459PA/uAv0xBVysbkiezHOkVyrQhyUaAzkHUDM1N2UzRq6tVEgy300JdO9nTGrLMZmUPR/Ah4B7gFgqS37r3MixR6aFFMuTUNBzKa7UFOb60fkIjSVid1yOWm4EV2RRZCEjTGTEhsCoJq73IlYWC++3iQFpmKirAOkO5mwRJWF0MPGp7sdowXfK1KBLYZcMzaszYXVuPgF+SNNCOB5Z/HkkrYwismQhHl3UpGouAJ0CrGu2iip0QlbEY8yrWc4VDLK0OAZuAxzHYqvs0hQ5WDTvAqRS/kITVTQVCDCKeBL8ILPcsXKHcldOpd6LMm1sBbE7C6jzD+5U4Oj5biIlwNATWGtYJ3U3q/Lne6RUOImUakhr6g4aHbRYCQRJWvwDGynE0njMCQaaCI9hPI9YL7q1P1Q2B6aJBpyz3nFk2d0i8g/kWsT0Jqx8BR8tx5Gtk3G2GtYKXQfcBA7PxsjoBaW3wG4dmeAg8IvQY8DZw8CrKVAaeFbwJLEAMNHbfgWs6SxBdYjq7BLodOEn6UvVqaxCzCKWFNfMvnV9oO1WtK87zdbH3eeAMcPEafzeDuPDvnrTz1343Xr3dAOkWSIsB5j7mUMD1gAEKJEXAGdf7AvcFUsOTtplG/BwA24EfsdNqLfrl/1EEqgm+KcfR8cDwHvC9pLP1J/oiIGkV24XYzfW0/gHhg7VpVb73tQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="80" width="80" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0FC6ikJDsAAASPSURBVHja7ZhdaBxVFMd/ZzepWGlt2SrUbiO2i1oTpIpWoi8FtVoE9cEaM7Pz0ocIFQWxWKkFKVq1BakPgh8PPnQzs4If4DcRBOmDaJE+qEUrmyKy0aRmK0jUptnk+DA37WJ2N9nNsgg5PxhY7t45c87/nnvOnQHDMAzDMAzDMAzDMAzDMAzDMAzDMAzDMAzDMAyj9UgpnTkA7G2Bra9SxULvUhRQW2gvkyoWhpeSgImWWlOml1oGJurKETOtMAFMnh9RVQwAOuptb1XuXTNS+HB2oJTOdANfIrISRRGkmYd6fpAEiMLcdLP3qyoiMhOFOW3ShgAJVchH8/vR72dFkDnzEzUyrwgkK8UDSBULJ1LFwqUo+WbFc5QVPef52Y4mAr8BKAtSRvXzRfiwC6UsQtnzg+fmbRbIx3B+/qZaAqoqgrIhVSzM1DKWGil4wOiiuhfSbB140hkAkVsX4UK3SwEFfax+9gWrQLfrBY1uryWgCHipkcLUAhzoanch9PxgOfCQwinQELjI84Onmup3ymZgHNXfQVZ4fnB17cWmj3jLvaWqgnBfLQFnUiOF/EIcSBULUwLjbdbweRfQOyAvurEX+l1NbWgHCFtAJxB5wpWtT+tMfxWYisJcv4ggcEctAScbPLacabOAO13z2ROFue+BibiXcX1DmewFy4AkKqeBDwBBucrzg84qWX+zKgL86IbOuaayeo6ACssaLGSr2rh9BxRWAG9WDrtOdqyxdec25/9oFOb+BD0e71DdVWXufhFQ1R1uZMrtgnVzBBRIltKZexbixHh6Y0Lh8vYlnz4tcUAHK6L7LO4mdHh+cGUDC3+LqoLydVwPpS/exfKyO97MLtpKQbcDY/lo8GT8TPnHGVlftQuDflRKZ2R+H+RE+7Iv2wPShXI0H+Z+mh2PotwkcFhRUM03sBjdLtjj7sT7M4g7deh1F8TQAVQA3q0IfMj96q3ahTVeik/qPb6UzjwMXCttyz4Zcs4/63lBp+fHV7+f7QT2ClJGpNfzg66F6SebBEGEbwHy4WAZ2OdUe6UiSfYjEIW5RypuftuJf1fVg7QgAtxdWpf52715VAp3SSmd+QX0tYpXvXZwhQtuCOEsxJcgZ4G/gKQL6tGFdWDdgChRmPu1ItsOAmVEtnp+sNbzgwdQXY5ytPLeKBx835W7LfO9C19cpbX3AevjRKUtCeh5wTG3UocQdgAPVrnuj98A2O3OivWaUQJkNcgfleP5cHBGYThOC70TGHAZ9czcM6ROAvR72cs66hQ5gJkaHxikTbUviXKjxAX+QNwxawozDqwBssAbdcxucyL8UCXkrQi/gTwO9CAyFoW5L+ZmsJxR1bUi0pPQ1u7EZCuNqcoehCTIkXriOfa5SF6ax+hNKIjIyf/+FYW5UeA0sBmlQ2svxITEKbQxIciRFn0LLKZGFvYxVWFMoSB16mi/F3SI6E5gGHT3fDajMPe6wHegJc8PttUpgNcgFIBvavh2WOEUwiiqh2rMeQ9kGI3PgoZhGIZhGIZhGIZhGIZhGIZhGIZhGIZhGIZhGIbxP+NfTtmklCc4oeQAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:Logo height="240" width="320" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAUAAAADwCAYAAABxLb1rAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAAd0SU1FB98LAw0KLmQ47LMAACAASURBVHja7Z15nFtV+f/fpwulLXtZ2wEqDcq+yb44KqvAsMhmMx0sBPyCMJpg/LEpgiIgRhIYNpFgYTopKLI47IgwghQUsOxb2KRAoZ3SQhe6nt8f54kNmXtvkplkJmmft6++BpObe889957Pec5znvMcUBRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURQFwBQ7oLshdBFwCjB61a4qC5iXgMSo6dmb9dVRlJVcAGeNCb1kDNtqNa1QQQvGWHvjqA/eOlWrQ1Hqm0FBlp+KX88Ow/UY5pTuhtA3tDoUZSUVQBn2Kt52s7WWH2lFKMpKK4B2tFZPgCVo+JpWg6KstAJotHaCsVoFirLyDoEVRVFUABVFUVQAFUVRVAAVRVFUABVFUVQAFUVRVAAVRVFUABVFUWqbITVWHgsYl3EAgP8CsyzMN1iwBgxrW8tGwEbuGPcTNHJbUZR6E0Brscb8T8FeBR4A+4dR0996rdhvu8eEGq3hFAPfBBr0cSqKUi8CaMEa48y42wycOmp69vNyTjDqg2wX0AXQ3RDaCbgS0CwtiqLUtACKwWfuGjU9e3QlTjhqenYa0Ng9ZtxGFnMfhl3M/66jKIpSOwI4B9hz1PTsG5U+8agP3voY+Hp3Q+hU4IZV8aGOb56wp4ErfFwOg4wxe2U62leqZA7h5pbNgNvBLvXucs3nmUz7wavKOxBuntABfMX/CAPwRKaj/f/V2HN8HOzg4KPMlExHe1u9CaCzxqx9YtQHb+1X7YuNmp79Q3dD6I/AdGCjVUoBLetgzF6er45ZWW+Zaw3s6neHFgiHW3bIZNpfWDVeAhMuoda2A2pGAMPNLecC+5YwaBsBVEQAB/Xf+4kBMv0hfnkiuHTU9OzGwGuavGpltnZaNjBwWJC7wxjA2HtWlfqwJb3wZs3xzS3hmim45aeUlmZux0pdsr8E0ABTRk3PNg9EvY6ant0aw1uawm+l5YelNRyzaTjcstoqMAQImdJc39bARTUi2g0Y1qVEn324uWXDehLAqaOmZwe0pxk1PRvCmrkqgSsX45tbhgIXltpwrOGRVWD4W2q2cmMhFHZ1ONAujHvLGk/CpvUggBaYM2p6du/aeC8YKzPDqoMrS1OHI8t8JfdY6e0/2KOM+gPLrTXwHLcu42ALbFnrApjz++1WKy/GqOnZOdbySzQ0ZmVq7ZN9vlnq1dEZzNDx4ZarVvJOYZ9A26mnVXzgAA9/L7bW9rRCrfUrs8FyUK0LoLFw/6jp2WwtvRzrf5C9EPhQlaP+CTdP2AvDMJ+vD/bp6KwxK/2Oh9t7fLbYwhIfwVxzfHPL+AEs75kY01PojHnB11gxtiKiXS0BtMCy9adnD63RF+QYlY+Vwta53ufdm5PpaP+79R/1DR8fnnD8ytkptGzs89VCA7f4WFTWwCUDVN6vYFnbeAvdGQE/rcjS1+oIoMVYqNmQg1HTs0/h4gPVF1i/DT0E7OAjcM/Jf3T5Nnhj/riSVk3Ip03OB27CWuMzWhs7vnnC4P73YPCQn0Mq09H+RNBAP9zcsnlNCqDFYqC5xl+Un7uOT6lTLrD+HdiZ8iZGrfVsXgYYEW6esBLufW238tGLOVj7rMXfLDaY2/vdhreM9RQQay+T/zcv4Oc1KYDWGJMdNT07v5Zfk1HTs5PALFEdqUvrbx2LbekxbHLRvzMzHe2vSvN6NXjli3lq5dM/7xVAQHcmM3kxxjzhP/Kx+/fzc/wtpudqNGuswZhrxUKc63en1to+B0RXQwCNhQfr5HV5S+WkLjlJMqgVmjHGWntH3hBqEdjf+zV4ix2z0tWMwS/k7OMVIx+/QadZc3x4wvf6cfh7Ot4z9WQ62t8XMZnr8/yMMeaAmhNAiwVbmXV6VX8A1t5lrboB687IwV7h1YithSmZyacVmBMX+DV4gxkUbm5Z2ZbHbeUhNGB5QYa6TwYsk7PGmMv7yfrbxsBIj2djwf5sRYF4x+/5Wdv3meCKC6DBsP4H2dfrorM0psMYdQPW2fD3SOM3vWt4pvCzTKb9E+B9HyvCQmXiyWqjbrx9mpJt+Fmxihcba67PBdn1aL6wabi5pT9WiN3vKyHW/CGvQI8EtN/h4eaW4TVmAdZPjN2o6dmXVFLqjrR3whcLcKKPpXCAjxVhgKHh5pZzVpLx79d8JAXI6xwMSRu8GODO6o++fMNYZkunlePRgBEcBKb8GgABxDKnzt6aBaopdWP97QmM8m5P5p0Vkx9fZkpm8hsBEU8W7EUrQ/1Y2MrrPq2z/P4nKpmO9jeAOfiOhe23q1nO8c0t1xjjqz2HfcmC72ifFjCEw2LH1tYQ2LCwzt6bRSotdcNvrc/QzWB/UUQcjvN7ZS1mtXB4wj51b//Bnl6GnbHM6nmsacH4hYGZNcLNLSdUsagn4d8j/cfjs8/8DFuD6VOegUHVeQ6KUmGrIdzyFazd1/Qc/1pgbqZjcnvwS2nuCXhhLcb8bSWwAff2ucEPPWzmvwU0VYu1ySpZ8bsZ7HA8Jz+40s3c92BWwCm/VWsCWIcdp1LzD8kQ91wvKrkmi/0+09H+hbX2dz6Wh7Gwejg8YWSd11LI2/jtKYCZzOQvwF7tVx8Ys0mVxun3+aZksPza51efBJyxtixAC2vWmd9khMpLbSMzfT/07KysJdPRfnqJKvpL67P6x7h34dm6tZCbJ4wJ6OBf8fnqCmv9V0OFm1s6q2BurOc9iWU+z2TaZ/o00oeDwtXCzS2jaskCXL/Ohg2rqcTUPKcENKiuUk8ypaP9MyzT8PM/GbNlvVaQsWwb8I7/y8cqfsfAp371YW3fhpceQnVjgOYcGvCM7/ULVxNhHFczAmhg3Xp5abobQocaHQHXfhdlCcjfZyaUOZY+CN/AaAaNb55wc30qIFsFfPlMQH2cgK8byI4MN7dULmuOZYJP/CHW8u8A98XTQYIDbFFLFiCzGkJH1Mfw156q60Bqfvh7lF+suoWXMx3t08s535SO9pnAcn+PiGmux3qysLvPO06moz1oyec/rK9BbCwV2n1tfHPLnhaG4T2JddOUTPui4E7QzvXWPwPwjZoSQBOcx6uW3ppd1f6reX4X8J79rJfn3NfXHoLB4eaWU+vPAPRJgmD5NOh3mY72RQaT8nGxGWDDCmnCg14dmfNB2qJbcxrDx/5D9d4ncajWLPDX6+S1aUCpZetvD6/hjaTBmpnpaL+rl6d+JiAs2gLX12F1beFjxX1QgiWQ9HOLWvcc7q1A+db0EbZFmY7J3SW01Q99XRfGfLWmBNDCqO6G0P61/LZ0N4Q6dBlwjRvolgs8e31rDdbe2NvzZjralxjLOX6mFJZB45tbtqqjjmJTn1lSi2V68fqY/F9jjKeFJZsmfbOPw9+MZ+5NawHTVKKmPBz0Zbi5ZbNaGgJbC1fVduOyR6jE1HSjHm2wh3r0+tYYYzOZyef18SW9KugFNpZn6qir2M5zltRiMLxR4kmOw/rtv8GIcHPLcb2uastxnh2ZW8r2eIkN9p4igtOrmeBqDYGNgW26G0I12Yt2N4R+C6yhMlPTnOUb+GztX/t68kxH+0LrMpJY/0Y/oU5CpMx2AcrxdIkGwb+sCXIM2F65BcLNLYe4pKeekx/tUzomf1HKeaZkJr8QVHxj7La1JIA5X8oDNTq0+rGmwap1o4af4JXzDwvGfL9CVzke/5VABswTdVJbX/czvWyJluyUzORFBlI+/YGxsF7vHqNvZhljrf1xmeeaFfCsGmtLAN389ObdDaGLa8z6e9nAUFWYmh7+nuFvmJmnMx3tcytxnSkd7fMICAQGdg2HW+qhp9zDrxG6TDglC0zCb2GIMYZwuOW+8mXAe9tSay1TMpM/LVNNP/HNYGPpVQabqq8Fttae390Q2rhGxC9qrd1GY59rnsu9lktZZwGeW+Fr7e7r+3Ld+BU1byx7bSzkvilLYKZ0TP4A+CjALVDWypBweMJf8Z+5PaRsMTW8h8/KBQvrjQ+3lG3YVF0AJZjynYF+SWaNCW0FJHXoW/PW3xF4r8+2Bt6b0jH50Qqrx9sBHaIFouHm2rUCw+EJmxsf350tYQbYg6MCOoTVw80tx5bR+A8LsK4f68V4ujPoS2PKnwjpj2wwBhjW3TDu04F6SbobQpsYY19B9wGuA+wvfUYSBiq/10wmM3k5Ppmk5d21Fo6s2eoyZge/LTMw5v1etNb/FOkQSgo/Cje3HCb64jX50emT9ir4zTD2UQJMdfz2RB5gAZQXyazd3RCaNwDity3wgTwHNf9q2foLt+wIZkefxrwk09H+uypd+taArtFg7Z01XG07eu+PbI2h5BCYvGFw+xLgN/7t2K5d4qn+6mVwyMqPCb250Skdk18LUhgLu9WqAObEZ2R3Q2jZrDHjdugX8RsTOt9a+xK55LFKbWPsz33tHOio1mUzHe1LMEzyN7IM45tbanXV0I7GZ4c8epvey5IMGGgSbm65v4j1N9j6tDljDJmOyZ/14X5nBPRUZWevGTIAD2wQxjzf3RC6b9T07GHVusishnGfABuY3J5YSm1bf80t61hrjwlw0X4/3Nzy/Wo4MWxuoGsCMyQ/R4XWxVa07NjdveYFxNfdKwHMZNo/Ht88YYbBbOxlDoMpJjQ+kx/WWsv3+na/zDDgN6m6Xy1bgAXWKod2N4SWdjeETq/kubvHhCbNGjNuOZgNZGig4lcfnFNkgkq2gKj8/4zLgBx0cWMwG4SbW4bUWqUZzGZ+SuG3SVSJZz7c+hrjDAuHW74b8OPvGM9wFWOMMXf1UTveDPo23NyyVs0LIP9bYshgLNd2jwkt7W4IXdsn4WsITe1uCC3D8H1jTM7+VvGrH87G1vAklcECd9dSkcaHJ4zzS5Rs4fM+3u7zRbqjST6W/In/66h68kCmo31xH2+72OKKspLaDhrYd+p//fpg4PRZY0JH9+F0u+VZeyp89TT8DbecnjNnariYxsKh42vICjTG7OBntxrDe305d6Zj8lLg1/hHTvgtJZ3kI8gA4ytw2/cHj5Ht1+pGAL1qqNc/typ8dYvhIp83wK740x//cu+St10lo4pYDdXcTgHf/bcC50/6tSlrrQk3t9xaYP2tgX+2bTId7X3eMzzT0f6R9csq7aIF9i3nfEO09SkDPIw7BNjA54U2UzraTT+XZ4gxZknAIZeHm1uuyHS0L6txAXyzAmLTHQ63/BfDZp6KZjmq4HndZbz97tbChErdtLHmQwxjPIpkgLLWBOu2mMpAD+Mu9LG4rHGzif3KlMzkpVheKnLYXjVSfbsEDIf+XSG1Oczr8RgnN8PCzS0bi/U3yMD+PhagMfDnCg4Wg5K8bqMCqNQF4eaWrwF7GO8ZWAOcPUBD8v2K+GT+USNV2ODTqwD8p0KV8VrQBLmF3DA4YGMi+8+MC7CuUKdpXwwoD+ObJ5Sce0AFUBlIfhHwHj+f6Wh/bSAKlelon2OD3MkWM755woBu/xoOT/DPten2Sn6lQnWx1FouwcdHa6zNWcPpgPqqcLyvecS/7wKD2VoFUKl1628o1mdW0KnPZQM6NIdjfcNyDNZgnh7I8lkTkATVmMouOTX2t35DW4wZGm5uGWSt9d2ZLZOZPLei9w4PFTlkOxVApaax8KuAJFRzMx3ttw5k+TId7X+RsBzPrNTW2i3CzROGD6BA7xLwdUWzL03pmDwn4JwGiPusorHAaZW+9ykd7d3A0oBDSl4RogKoDFQDjuPvaLu2FsporZ2Mbz47LJiBLGfQDPC7Vbjewf7eCi4znptXYSgxe0wvOtD3A77bWwVQqeXh7/9Zawd7i4sl09F+Xi2U0xgz0V+kjQEmhptbhg1Q8Xb21SNrs1W43tvek/V5yxl6Fua56oUL2Q/9no2hZ4iMCqBSS5xtvLN4WjC310ohMx3tyyx2ZpEZ4RMHxjr1SQhgAGNeqEZdGMyFlLNkwZgDqzeCMNMIWPgwPjyhpCVxg/zNSM0dWtwKV8plfHNLI/AVz5fXJT29oKaG6pY9iywwuiHc3DK4Xy3o8IRtiiQ2f7Y6lcEV1m/TEI/Wkelon11F98SDQdc2xpQUDzgoQGGf1kYeKH4PajX0pg1xoW+dGvOfvmUwqYIVmJn8joz8gtrCDv1cizsVsdZerJJF/LnBvFtC67DW2LOq+x6Zv+OXCcJJ9C59HQL/El1b628YWH6t1VCm5dLcMgb4pr82cmlNPmzDWUXawtR+7kV28m38sKDK1z6gFHXCmlR1O6b2+RizKMBE3KdPAjhqevY+4Czp+tQSzFUrFmvt19f/IDu3VgtpMENqcuBuuTrIaMh0tP+5Fusz09GeLDIc+9+SsH5in4DkrTOqfO13io6N4K0pmfb+eNNmBfRa+5dygsBkCKOmZ5PdDeNuMZgzcOsfl1ez1Zo+PDxj7ANBKX0r0HgNhtuw5k/rf5BdWMsqncm03xNubhnkZ2dlOtoHRgYNvkk0p3RMrvFO1g7yMwJdmvd+rFNr9/V71atdjkxH+3LA+O6U14/vV6ajvaGWd+xTFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRlL5itAr6zvxJo8cBNwF7AZ8D1wM/GznxQ6u1oyi1yxCtgj6L3yDgbmBb+Wg94DzgI+Dqmi58OrshcF+R92A/IqHP9UkrKoCKF3vniV8+p9S8AML5wNcDvl8KLNdHrKgAKn5s5/P5tgNs3a0B7AJsI/86iYQezvt+LHB6kbOcSyQ0Xx+xogKo+LG6X93OnzR66MiJHy7pR9HbDjgaOBTYDRgs37wK/KTg6N8CQwPOdg/wO328igqgEsRcn88X9Iv4pbNrAd+XIfcOHkdY4BQioSV5vzkQODbgrG8B3ycSsnm/2RY4BLiJSOhTfeyKCqAC8B+fz6dVWfjWB+LAGcAaAUe2EQk9mfe7ocCVAcfPBg4jEpqd95uRwJ9kKP1L0tlJwMVEQh/p41fqmUFaBX1j5MQPpwGPe3yVqpLwrU46ez7wNnB2EfF7GzfRkc95wNY+xy8BjiISer3g89+L+AGMAH4IvE06+1uxQBVFBXAV5mhcHOCbwLNAZOTED/9cBfHbH3gBuBhYs8jRS4FmIqF5eb/fTgTQi+VAC5HQ4wXXPAdo9jh+dbFAXyedPU5fAaUe0UDoeiCdHQb8BvhxGb86h0joN3nnGAw8Cezuc/zpRELXF1z3aOCOEq93G3AakdAcfWCKWoBKpcRvc2BqieL3FnAOsPmXxM9xQYD4ndVD/ByPy3WfL+HaJwD/IZ3dQR+aohagUgnx2xO3ymTDIkf+S4bF93xp5nbFefYDHvPp8M4lErqshLLshfMnHlbkyAVAmEjobn2Aigqg0lvxOwD4KzA84Kj/4uL7/uIpfCvO9TBwgMc3USKhK8ss135AG7BjwFHLgZOJhG7WB6moACrlit+BwL0EBypfBZz/pUkO//PdCuxZIFBnEwn9uZflG4KbALkIWC3gyJOJhP6oD7QyxKLxicBEYFIylZi0Et7fAbiVVdckU4l+WUCgcYC1J367y7DXT/xm4mZrHyz5nJHQ9ypaxkhoKXAZ6exDuPjAcT5H3kg6+xmR0F/qvGGOAEimEgsGuChjgUZxZ9Rzfa4NLPAQuRuBzYGXgL/1R1l0EqS2xG9ToDNg2PsCsHtZ4ldNIqHncBMrjwS8X+2ks7vU+ZN5FrhWX9CKiN9YYA7evuRLRQT/1V/lUQuwAsyfNHqsx8efjZz44ewyxG8YcBf+Ex5PAIcTCc2tqZuPhGaTzh4KTAa84gGHA3eRzu5MJNRdgQY0SCzO4cBHyVRipscxI4EtgMXAm8lUYrmHRTc0mUrMlfNtCQwD3kimEl8UHLszsBXwn1g0vo58/HkylVgWi8ZXx8VDzk2mEjYWjW+Oi898Jf+asWh8tDzXj5KpxMdl3OtQ4Ku4APU35X6Cjt8CWAt4J5lKzC3jOhsAY4AvgBn5r3a+lSbl2VI6tjeSqcRij3MZYDSwAfCJ3HO+f3qC/B0p9bk8mUp8Jp9lcOFU8z3OO0SuPQR4O5lKzPexLJckU4kFee/AInkHPH3kFfcBtnY2boFLEbU98BV58COk4J8B84D3cSEbrwJT25q6ZlfguoPEGtlb/AgNwNryYi+Sa88E3pAe/Sl5scrhi7amri88BNCrcq8cOfHDaBkCmKBnwoIcjwOHEAmVPwRz/ro9pV62BjYDRkq9zAW6pXE9AzxGJDSrl9brYHmBj/c54i4ioaP7KH7NuCQOm+R9fFsylfiefD8Y+BVwltwfwIfAD5KpxL1555kkDbEJl7x2s5ywAWcmU4lb5LiJuJRmIwuKsnMylZgWi8YvBH4B7CR/c/c3LJlKLI5F418Bbgb2y/vtA8CJXsJdcK+H4YLrcx3iq8D9cm8XJVOJC/OO3U2uk1vhsxy4BTgjaNgugnEzcKTPIUcnU4m75NhTcbGo6+Y6eOC8ZCpxTd75GoE/SrvP8T4QSaYSD8ei8T/g1qzn814ylRgrv5+Gm1zbOZlKTMs7bxQXxpW79mLgGuCcfBGOReNzxHp8GOefzo2k3gSOSqYSr1TFAmztbBwNnCYv/9d68fuXcNlHbm9r6nq2zN9ujItVOwnYqMr2zkXAhVUY+jbKi+037G0qW/zS2RAQBcbjkrSWwnLS2b/hJljuC5xZ7mkJLiOdbQHWAQ7yOOIo0tmJREKTeil+OStzCfAH4AMRnqfyDrsAOFc6uKuBUfLZHbFofKdkKvFq3rGDxd1wr9zvHmLB3hCLxu9LphKzRDz/KnX4bxF45Nr53C4dbicwW8RvOPAQEJKyTMUlk2iR4xsD7rUB51sdIcdOBQ4EYj7HPizH/lIa+wTcZMlC3LJFPy4W8btZ/ntr4C8iMAdLPRKLxo8FbsBFHZxPbhINro5F4x8mU4k75Xy3AhsDv8Ytw9wSl5koF0c6VTrj7UTcXxQhDXrupwBJ4FMp4wIgInWxusf97S8dzvW4pMTfA3YWF8Y3KyqArZ2N60uln0LwjGUxtpN/57R2Nj7W1tT1rRKuPVhE4xcePXQ9+f1WA67zscY/AY4oa9jr1uYmgJNZkQ6rVAaJeB0EPE06eyqR0ItliOBi0tkTpBfe0uOIBOnsPb20Ms+Rv9FkKnGtR0MZLu/DYuA7OQsrFo0vFoE71aOTuT+ZShyZd44X5T3cHbgvmUo8JMPX8TKs9VvfvRGwazKVeDnvs+NE/O5IphKtuSFeLBrfDvhGLBrftuD4fFpE0B5MphLHSdmSuMmPbxQce6aMdH6VTCV+IcfeLo0/EovG4wFW4P7y92fJVGI6kI1F44+J2C7Mcwfklk9OSKYSj8s1XgW6RIDulOHxhtJB/T6ZSrwvvzk3d7FkKnFTLBo/Quq4M2ddFuFn8vf4ZCrxN7n2H2UE+YNYNH5xMpX4sOAdjiZTid/LsX8WMd63oj7A1s7G70qvMKrCkpAt4dpria/gkJXAhfhj/JMTtBAJvVeG+O0mPfimFSjXHsAzpLOnEwndVIYIziGdPVZEcFjBt6OkFz+tF+XJhfH4zSjvgEsMMQs4IxaN5z7fQv56jUwKJ5Neksa5Wpllm+whZnvL3zVlqFzY5rYC/AQwN2l0d5542Fg0/pCHAOaG1+MKrrNQrPHNZfjsRS6Eam1geq68ecPonL90J/nsoFg0nhPNEXn3QTKVWBKLxh8Wy/HlWDR+Iy6c5a0+uDxGS/kXkDfRlkwlZsSi8aki4HuLlUyBmyF37DuxaHwhPhOLQ3opfhfJ0KIa3F3k2iPE5N+97qUvnV0nv4csIEUk9FAZ52qSTmF4BUu4GpAmnd2wpNUiK0TwBdLZc4ErPL49hXT2CiKhN8poCOvkRhgBkwgbyN91Zeifz1xcXsRCCs+1qJf19I6PVYhYHrt7lGdYwPlyRsUMjxFBIblsPEcAyzyuE9TGb8Ilzu2IRePXi/jvKUPfF/LqNTc6afU4//ICq/dC4P9kiBqNReNp8UUu7kW95lw3Mz0mMWYV3H8+hfW2uGIC2NrZ+LsAfxV5vceL0qP+Fze7lCvsptIbb+MxbF6If0hFjj8GiN8C6Q0eBp6TSlosjWIsbte2o4FdA87/iZjMczz+PVZhCYzlOXa/5BimZxqrIPH7pviMVi9y5KfyTD7BZYtZT6zPhiK/u5R0dkaZ/rurgLBHXQ+WRhIu41yfSeMeHIvGN0ymEl5CkJtIez2ZSpS6HUGlgm29zjMzb3h5RZnnm10ghIWCUFg3ACckU4n7yrlIMpW4XiZbDhLL/FNxx/w8bxY7JzTLgA2DhCyZSnwO/CQWjV8sIvgzcY+96tMZFiP3nDeKReOmQAQ3KLj//HKU3JENKVP8zioifi/hkm3eUWxmVyy53XBLtJpwsz8PtTV1LQz4zffwn2W8Azijralrhsd3c6SXfhS4pLWz8UAg7TNU/BjYp62pq7qbAaWzI3DJTL04q+RJj3S2QUR/9YDOqB3nFH7aZ63wVvLCnh5gmVxPOvtsyT5BNylyBvC0x7fHk86eW+rwPplKLI9F4/8RMT1GGmnOOhycTCWW4RLQzge2jkXj2yVTiZcq/MRWL/P4J8TveEwsGr9Sylgqz8t9fgcXF5fDa+LkcRkGHovb4a+cIeZ3gMOBU5OpxI0+dT9f6n5n4Lu4iQ6/8w1KphLLk6nEp8BlsWh8Fm7CavsCawxK8NsnU4lPYtF4zi1xUM5lEYvGNxZLdTluYqXXDClD/PbBoF69kAAAHQlJREFUhSB4MR8XwnFDW1NXSTOHbU1dC8SJ2gX8vLWzcfOgSmntbByCm4b34mrgR2Vc++HWzsZdgX94+Ia2x+W/a6/yALjFx386lUjojhLFz0g5RwUMzY4nEnqmiFi9BsRIZ28A7vTxlw3DrezYi0hoeYki+C/S2dvpmX5/MM55/9My6usK3CzslbFofEeck38bGdp+T2K/fg1cAjwSi8avkaHQGPFLXZpMJXqToOG13BAzFo3/Qqy9vyRTideL/O423Ezp3lKeP0l72wrYKZlK7B3w21twEw/fjUXjt8hoZj+5Dy9L+xTgJAlreUB8etsC6+VP8vi4OADOj0Xjh+dZVK/hJjJycZu/wM2G/zEWje8qFt1G4o/szAuFeVcmHXK+zdwM7XN518zV2wUiZCOTqcQvA8p4iTz3W2PR+LXit4yID/LGZCrxQV8a4aASxW+YWEyDfEz9fdqaun5fqgD5iNJ7bU1drwQccjQr4rUKe9pouddua+r6RKxJr575dKrPST6fX1zGOcJ4TO0LrwJ7FBW/LwvWq9LQ3vU5YvcAC9yPX/l2AC5GsdTh2hTchNF8sVYvlLLkzwBeJqIzFBey9Hucr7qBnqErpV73KVyYyHC55q+B9Uv43SKck/5uqdNrZHR0mo8vL/+374k/rVs6yiRuMucEj2M/FMtwqlhoN4ih0uzjmyz0jc0W99CR8q9F7vFxiaskmUp0Sl1/LIbOjXLMnrg4v3xXwFmiFWkR4evl3/+angjkV3HRCq0lPPcfiHvsPBHETeU8Z/S1EZa6FO50H6tgAXBgW1PX8/0gGCf4fP6TtqauZb0U3Rekpy5kLwnortbw92u4WdZCXsEFu5ZyjiEBYvk5btXIzLLL5n4T5J87t8zzvSA+2UI28rFoghrDVeL72VYs9fWTqcRZed/bZCpxOS4cYxtxq4xJphINyVQivyP4ofhe7y24hOfnyVRiIm42cmdgg2Qq8c88wV03f0he8LsZyVTiKLHQdxJ/6zryWbF7vQcX8L09sGUyldgZNwO+rlw3/9iXxaLcUMr4VWDtZCoRDRiu7i9D5r8Do5OphBErf5y4srYmLzohmUr8GRfgHJJrbA6MSqYSf807ZhwuDnAH+bdeMpU4PX81ifhvd5Bzbyfim2M/ub8XC+7vD2L8fDXvvD/y8EdujrdP3e/z4itBxPp7V26skP9ra+q6oR/Ej9bOxk/yHJ//M6fbmrq26uN5j6HnNDrASW1NXZNKOUfZK0HS2bMLX+KcmBMJXVGiAIaBDp9vzyQSuqaPIv1n/HeO251I6N9lnOtYwCvzzI1EQqei9DsyUXE+cHj+Khn5rkuGt5snU4n/rsz1UMoQ5Cgf8XumwEFbTfEb7SF+UJlZ2X/4fL4bMKlKt9Tk8ZllxUqDUjjZ5/P3ZOjXV64LEMDv4lZGlEqn+JYKQxYOQxkocn6538ka4plilR8t4veXlV38Sh0Cf9/n80urPlP6ZRPWz8/VJ9qaumaKf6GQDatyJ+nscLzDeJ4iEppR4jk2Ab7t8+1Nkq6qr3SxIlC2kLKGrkRCi8gLTs1jE9LZr6oW9T/JVOIOnE91MM7HOAXnk1sX50cNrwr1MKSI5TXcp6HNpEjAcoUZ4fP57Aqd/1N6BkquV6V72Q3vZYMPlXGOAwLcF3dVpJQujOU5eq48ANiedHaYCFupPID3BMq+uAQV/Tn8Wwe31GsRqzDiU71KMuKshWS1WZXqoNgQeD+848Lu7u3EQy+xA1AP1WocO/t8/s8yzvFNn88/lEmHSvGCjwDmwjnKmfx6wufzHUsUrRtxS91aepstOBaNH4cLG9lY/v81yVTizJWpQcua6A7g/WQqUdIughL0vEru5ldsCOy3YuKRfi6n38Pp8zC1tbPR+Fh73VW6F791v+VkwfET0RcrXNagWeSGss4UCb2Jm50uZJsSGvXquOwmJ1BCCIrPOdbDxddtjJv5T5dpddea0G0Ui8a9ZpM3x/nxIjrQ77sFuJPP58/0cznfLVMIymFbn3qo1rDMK7zmEyKh0obzLvh5G18LMJ0dW8GyBmWT2aAX53uVnv7Pr5RgoXwRi8a/DayeTCU+6uW97IJbzfFULn9gnXMmbqmZKair12LReBOVcw+t0gLoNfmwmOIBlhWlralrdmtn49se4nFQa2fjkLamrr44/Q/w+XxqlW5njMdn75Xx+w3xX652Ev4B1pVmjV52ZLuXUB9erEmB7zQWjX8LsMlU4rFYNL47zp+4DHg8mUo8l3fcoLzOcpBYTguSqcRDeceMwi09Gy0jjgclIDn/euNwcXkPyejpOLFIr5UlY/sCqyVTib/Lf++Jm0h6IJlKvBuLxtfARQBsigvgviuZSswruMZquNUjX8Vlc5kO3JOXNZlYNL4ZMkmRZwW+lUwlXpS0VEO8nk8sGt8UN/O+JvDPZCrxZCwaPwSYl0wlnpBjRuCWnRXWj+fned8djovpm4NLJTZ9ZRgCe62V/bCf/X857vWxQib2Yfg7BO9VH5/i1lhWgw09LcDSGV0nnScl3ufqpLOliGkHbpnelwwe4O5YNH4dbs3x74AU8GwsGj8777iHgMvlv3eX89yQ14CPEHFuxy23/D3wpmQizqdJfnskLlj4Jjlvrj1cDHRKZpXHcSsyrgNei0Xj3xcXRUau0Q48J8vXcuUwOL/ro1KG38h9vy6hKsSi8S1ldJIzBu6Uf7kh78jC+5PffQe3DO06KfM/ZbngPXw5oH5Dr9/7fS75Dd8Qt0Ku7t6WbNp1L4Be0dMfD1BZJ/t8nmjtbOxtKMVF0tMWcnNbU1e1JkG8ZoDLcUCvXccjjtkVFNMca4klFpZh7oXy+YUyIQBuyVRuxchjYg0eKg24ARcCMgKXnWcnOdcCIBmLxr0mgW6U73+MS/eev03CCFz85DG4Gf+/isU+CZeteW8ZdXyASxp7fN7w1YqAnybW1KYiOhvjtiFFLMI9C9xAO+O/Tp9YNJ67/nDcuvlcYoOjKD9pbv55B+MWEYyRutsIt/zvM1xm7c3qfQjslQHji4EoaFtT179aOxsfoGcS1LWBrtbOxuPamrqeKNHyGyz+k/M8vp6XZy1UgzU9PitnCL9aHQug32z+OvRtFvLXsmY0t6/ED8RS3gJ4OZlKvB6LxnOTT3Pz95tgRfblW/IyPj8fi8bXx80Yn0HPYPnZwN7JVMKvzJdInB2xaPwiXK4+gJNzQ0PJk3cBBUtMk6nE9QUicx1uUmNL+X4hMC2X8LXgXvz4llhwrwM/EqGdJuFAN/Wh3hul/E/k1d3fZcb+bBHYq+pZAGuNn+LiEgtFYGPgH62dje1i4v/ba5je2tm4jvT8/w//8Iuz25q6PqriPcz3EcG+WJD1Tl/3252Wb0XFovGZIoCl1FUuVdNTBZ/nVrp4TQTeGSB+yPC40Or9tMAv9qlXG4xF41/H7WOxtbwnYyrw3HOjnGcK4vym9bHed5C/IUmlnyMXITCm1l+8uhLAtqaulyQn4dUeXxvgRPk3r7Wz8Xl5+RbKUH6MvFRB659vbmvqqvb+r8v7OKydH/Ddz8Wn0x/0JruKX7qzxX0sy6cVaAOLPEYC4D3hVGyG1St86LMShpQ/wPnQFuOSYkyVYeW4PtbP6j5lKGeL1aEBz3NhgQU/RzqBN2pdU4oJ4Bcew+C1BlgEr5Gd4H4WcNgawD5lnvpm+id2aqaH4JUTUvJFoBBEQtNq+H3z2rVvWZkNsdLk0jkV+qvGyt/ezGb2NnA/55I5VlJQIXn6JlbgnYOek5obl+Fq8bLmcnXzUikZbmqRYpMgXsHAm9SAJfhzXBLI+RU43SLcHhIn9dPsttdMaDlDhaAGuWmNv2+jPeujnO03K08undNE8fvlNuHOrRC5rx/LknON/FfKYWQ47Gv1SmhOMXI+zP1zs8lCs0+bt8DGsWj8a3nl8NrI6mFcDsCDZeieb81uJuExdS2AXo1t49bOxjVqoOw34Z8OqhSW4EIRtmlr6rqyL8lcy8QrhnJzSZFfCjPwTuIKvdiTuZ/xKt97A1mgZCrRhdtPZXPgjVg0/gBuZ8KDcZmR2/qxOI/J37tj0Xg78B/crLHXu5mLU/1HLBq/JxaNXxVwj2/hZrqH40Jv/hqLxp/DY2227OvxN5yraGosGr8PF8B+EAVJQyQZ63liLU6NReMPxqLxu2Qi6j2qlVCkHwXwbZ/Ptx3IQsvytUm42b5ymI5L4vBDoKGtqevEtqaut/u5+F5+EYNLDlkcl+nlNZ9vd63ZNy2dXQ/v5XOlZvR5ApehJp9n8M5a4/X5LPnMa6+QZuBH8r7vKm6GFLCvCEL++9OF/8qkaR7X/UI+e8rjXeziy9vAnobLmzgCN9n3Ki64+yZ6TlichvMTDsNN5ORGFkt9rncKLtvLp7hYyHfkM3zqY7KMsHbBhe98U9xETxWIYAI3S/0P3KTIHiLYSYKXUtYEpojQ+CXu/GlbU1diAAXwV3j7AB/GpUtfIL3dGmItzQc+rlZsX1kJUdPZI/HO2HIWkVCyRDG5GTfZ48VWREKv16AAHob3BE3p961UlFg0vpNYmV3JVOKbq2IdFJsEedrn8yOkNxkI8dsJ7/i9W4CTB2iVSjk85fP5t6TXLIW/Bwjg8fjvwzGQ+OUvnIqi1OgQ+Em8Y7T2be1sHDtAZf6JR7lfAk6tA/GDSOhjGVIUcqAkSy2F+/EOpwH4AelsLQZLH+Hx2UK+vGOYotSOALY1dS3GexbMUHxz9GrhlUb9d1LWesGrTlfHrTEtRUQ/QfZI9aCBFdsR1srwdxfcZjo9XRaR0GJthgPGQlxOx+yqWgGlBELfjPfeEKe1dja2tTV1vdmPw9918F6f/Hyd1fs9uHWkPaSNgI2nC7gOl73Ei4tJZx+Q/X5rgZMD6qGukQwvQ4BFskytbpC9jXdalXuAUgTwPukhCnvwocAtrZ2N32hr6lrST+X1G+JugXPm1guP4jb2LoypPIB0dlsioZdLFNF/4b2/yEjgHtLZbxIJDWxaonR2HbwDeRfjvVNcuQL0OG4WdL9kKvFiBc7XIaOM5txuabFofFt531/J34oxFo1/hRWbgH+HnrPUXuefI+KzTo0L+w/lnk6vl9RWFR8CyzB4Of5O9T2BGyUspeq0NXV9jvcSrLbWzsawWIi1TyS0DBeD6MVPSzyHxflD/eIXxwFPkM7uXiEhW5909keks+Uubj8T7yVwdxMJVSIN+5q4lTWDK/R0Rsr5hooQDJcRxr/J2zdGgqXbpVM+XOIJS2FtaiijTywa/45P1paTcTn+dmclptS1wO0yPPNKDXQiMLy1s/HktqaueX0c4m4MDGlr6grqcf6ES72TzyZIULTsHzwP7/TrOZbi1kV+JoL6Gm529tl+3OnuOhGwwobbQjr725KswEjoCdLZK+Q8XmwOPEk6ewNwOZHQu2WK3jhceqPDcEkkhpRi5XxJNFekcerRadVJG9lRntHDyVQif8nevrjUcPuVmJGlFq28cTLCO4meW8CejIuJrHs3RZ8FsK2py7Z2Np4ivaBX73UcsFtrZ2MMt2FSyasqZOP17wATcDOFxxO83OsSXKCmX5T5hvQ+An1ma2djBriyramrulmvI6F3SWfvpKd/dRBwBaVvPXmONFK/zNaDcUlfTyOd/SduP5dpUsdzxNJZkxWZR76GSxqxC/7bkZbKL33el2eJhB7vRYMdLPWyJW4N7/0ErI2OReO74nLyATyZTCV64yvOLfGalHfeQdJ2HgW+HovG5yRTiXc9rj9SOo5NpJN9BI/19bFo/CBc8PNDyVRiQbHP5bs9cHn9DC6ouSvfBxmLxsfKMxyDi4N9NJlKvFNgwebiVHeRofmSvE3S18IlfVgLF0Sef+1tgb3kPt4A/p5MJZZ63NNnyVTiqVg0vqeUZakcm60rARQRfLO1s3ECbiWF19B5LC5549utnY1/wkWGvwbMaGvqWihbbI6UB7IFbuXDPtKTjiyjHLNaOxub5PzDKlwfG+AmJ37Y2tmYBC6oYmJUcAlZj6FnQPpBpLPfIxK6tQQhXUo6e6yIwV4BRxqp6337yfe3N97rRwF+0QvxG4mb+c5PcvGGl6UvCUDbpWPO//xmXE6+cqz8rURgbpdzbIjLTp6/6mZZLBo/L5lKXF4gQI+yIqkC8v/n0jPByA3S2XyFL68y6fG5ZJC+g55xlYmc+yQWjZ8rhgIFZfxBMpXI5f+7DzgwZ4fIv7m43IzgskQ34uJTH8sTzT/Q06f7ciwaP7ygE7gBWBKLxp8S4ybH8lg0fmIyleioBQEcVM7BbU1d98iQN+gF2kKskvtwS4sWtHY2Wlw84UyxPu4Q6+DgcsRPLMZjpXKHVbFehuJyBj7S2tlYPX9NJPQSbo2mF1eTzo4u8TxzxQK8qxZeKtLZNXGB6V6+4alEQvf24qzniPi9K0Py/YBX8iy0fH4u4nc/btnm9rgU9d8HTi3noslUojWZSmyRN/mRFvG7Wt71fcQa/Y1YOjmuFPH7pwjJwWJNbdTH2r1KxO85XNjUwSJWf8w75h4p3964LDdnyEjgcrFewS0myIVS/UaE7vAi1/6piN8r8gz2FtfTtsDtkjQhn5CUNYxbIneDaM5v684CzBPBjtbOxtm4vQ36bdKhtbNxtDSq/fuxfvYB7m7tbNy/ikHWZ8vQvzDBxChgMunsQbL+t5gILiCd/a687JfQt6SrQSwvIn5GXnSvLCUWt+a2N4Tl72nJVOJBsUiexc2mF+6rkbM8I7ld5GLR+E9xft4TcDn3euMz20xEYgbwY7Ek34lF45cB14v75qlYNL6WHGeB8clU4n35/bu4rMy99dmtIfWwHDgyb3b2oQLRflEsuhzXxqLxC0R8NwA+TqYSz8Si8Rny/WvJVOKxEoqQiy89OZlKPC1lelrE7esyAnmy8P0uyNY9EdgkFo2vn0wlZtWdAIoI3i9L0q4VH0e1xW976a2KpeLqFitzHv6psobhZvPWwgUNF8u024gL+q5OrxUJTSedvRDvpYXfwi3KP7PEc1mxHP+CWyt9Enkzl33kadyi/GLD8rPxT+F0LZHQM71o+ENZsQnQ1LyGvjAWjb8mDTBHg3Qey4ApudTxecPOvqQMy2URH45L/Z77fP2Cc4fE0nkvJ35S3jdi0bhXjs1S2VrabDYoNEVS3TdLvWwo11snr+y9Ed91pG6XsSJbNslUYnksGv+X3PMuHgL4bN6xi0V0N5MOvz4FUETwPeCw1s7Gg+Wl/1Yfy/KWWA5/LxC/sTjnsVfS0C9kOH0b8HRbU9fHZQrrYBmmfFv8FN/wOfT81s7Ga9qauhZU6TmkcBk1vJK4nkE6+wGR0KVliOpH8rsLZCh4jPTO5bgb5onv52HgASKh4tl909mTgEsDnu85vayf4QXlyqcwlCZ3j8s83pUusd56ywifc+cyzbxecJxXJMJsSt/Zb3Wfe5tXxEp9Eudrf1k6jE9wAc99cRvlyrLIw4f6mU95oWdGGEsN0eeU+G1NXQ8CD7Z2No6ThvYtXHxgseHxx+JL+IeY8FMLZ48lvrDDR/weB05sa+p6tw9lXyYN8y3gD62djUeJT67wQa4tw1Q/68drL95XyhCsZaSzLeLX8aq3S0hnFxMJ/a5M67JbhmbXk84OFl9NSHry9aRBLBJx+AKXKmkGbq3yu0RCpU8WpLMn4nZL82IJMIFIqFdhUslU4rM8y2k0X44SKMxqPEMa2WDgkIId2/pKbq+Yj4pkT8l1xKNj0bjJ7cMhs9hBPsDBeUI2zOO9z11/0/zzFj51Eb87kqnEMXnnO72P9/6JvCMjYtH4eslUIn9bgLEF5ctnKTVMxfYEaWvqegu3m9rlIl7r5TW0wdJrzsNNhrzX1tRVSjbn43GO1kKeBA6o9Prftqauu1o7G88Ri6yQ/f0EcOTEDydVYCj8DulsGOfA9pqcSkhc3Xm9yqDsgq9fkH+VJZ39CcHZgaJEQk/18SpPiqV+KjKLHIvGd2bFpkY5sZwTi8afFGs6Sl46NxGVdZKpRG+3dn1a3CzbxqLxQ5KpxAN5515brj8XN/n3iQw/j2LFfsZhvAO2c5bi3tIZg5uwKXwPsiLwG+N2s7tFrr06sImEuawnx76RV7b98V5COi/PbVCsE1oei8bvFSPnTNwkJrFofBt5LktkpFZXVG1TpLamrtkU3zymGGd4fGZx6eurtYj+jyLihRlVtqn604iE7ied/Slug28vzgG2IZ09UWZ+BxaXveZagvesuJpIqBIbTV2CS8p5gezVO08a3ix6xn3+WEYWl8qeGm+LaOwh4pnqpSW6KBaN/wiXLPSeWDT+kFjNDTLqORh4LJlKLItF45fi0pv9SbJMj8CtqviMnvvq3IkLC/tDLBo/Qfxj35Dh4wZ5118Wi8bPx81E3xyLxk8TC2t73KzzhTIUPxOIxqLxTXCTYYfgZqoL/Z9PSRv7WSwa3w1YN5lKfCOgCn6OC525SDZany3PZDXggmQqMaPeBHBQrRastbNxXbxj1p5ua+qq2m5TbU1dn+X1wgQMtaolglfQM4YrnyOA50ln9xtg8dsR5wwPEr9b8U760BvxeURGBC/gZhzHSUM/H7dUbWHesc+K2Nwmxx2F2xqyi+IrWd6R8831KUcGF3L0iFzjcBmW35Zvdck+uWfh9vdoFFE7UlwShQHZF0unN0uEby3cRNJv5NjFeee9CRc8P1VcGluLZZjbE/svuP2Gu3Gbn28hlufPCs+Fi+RIih+1scD1k5Xj5+Vd+1XpRKbg4hP3Ez/jSclU4lceLqDnPfylr3iUY8AwNSyAjazYIyGf37Q1dZ1T5WtPlR49n/famrrG9qPAXIabXPLD4oJSzyUSmt2P5RoplsBPiowgMsCJMvRWFLUAy8TPWdwfZraXv+Szfr37SOicIgJocHuivE06e54EH1dT+FYjnT1NLIOzi4jfdSp+igpg3/DbJW1BNS/a2tm4Jt5BvO/2ew1EQpfLMCbontcGfg28TzqbIJ39aoWFbwzp7Pm4Xb6uK+IKWAb8iEjohyp+Sj0wpIbL5he+UO29b4/0qZeBSboaCd1JOrsrzp+2QxEh/AnwE9LZf+H2u30AeL6klSQrBM/g/EoHAk24sKZSOsr3gfFEQv/UZqWoAPadt3w+Pxjng6qG9TcM50D24v4Bq4lI6FXS2T1wyRO8UmgVsrv8uxiYTzr7PG6LxXdxMWrzcJMGw3DO+Q2lY9laRHa9Mks4CYhVKL+fovQbtTwJMgw3ze41FD64ranroQpfbzAuvMFrGdfLwPb9uHl6kIW2Ey6X3r418JhewsX4PaJNSalHatYHKGmo/urzdUdrZ+MuFRS/0bgAZL81rBfVhPg5a3AakdB+uKVzLw5QKd7FBSTvpOKnqAVYPStwZ9xiaq9yLsIlKLiyralrVi/Pv5U05P/Df53s3W1NXUfVZAU5f90huFi7g/rheT6FS7N0W1l+RUVRAey1CCZZkbnWi8W4BAqPypDsXdwypFwDHcqKfR7G4tbCbiNDyGIzpi8C+0pwdG2Tzm6KywByJC5YtVLP9kWxxDuIhF7VJqOoAPavAK6Gm4D4dj9f+p/AEbKkr75IZzcQgd8HN6mxFaXNns/EReq/JPf/+IDvKqcoq7IAigiOwKXKau6Hyy3FLey/oB+3++wPURyKCy5fH5deahhuAft83FKoj4iEFmmTUFQAa1cIw7g1k9VYl2tx+9Re1NbU9Yq+GoqiAliLIjgclyoowpc3pukt03ALyCf3JbegoigqgP0thg24PH274YJ4N5dhXuH+GvNxmTY+xqVGegM3u1x2FmlFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRlleb/A7hhlB7cvnMAAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:Logo width="16" height="16" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0DN9GR/zoAAAEZSURBVDjLndO9SgNBFAXgb0OwFythOxf8IY2ljaQRax/Al7AUQfRRfAAbCxHTCEIQLEVUIiikXbATDDE2WbkZRghON3PmnHvuuTNFXVZn2Pe/dVvUZTXBBEUA0r2/7rSmmyIcxotf+Ax3GvyX004UG+AdPTxjhFV0sZa6aSc2C/RxvDQcXEegLqstnGAnttJKFN9yZFgaDvo4xEN0nGZw05DrsorVG5F7XEZOKxQZ4SlUjNWj4CM+0hYaS+M5Zv8dAp8RWJimLddCcLSOxVyI0K3LajvajuS6rDrYjZzmJcZJ9HCEu0CEDk6xNzP3jAC84gAX0/MNnIcWJ7kpxKe6gs2AL+fIuQyKAI6T5GX+jRauMj9vnlXg5QcATWTFHAxLwAAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo width="50" height="50" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0EFUuwKBkAAASRSURBVGje7ZpLjxRlFIaft6Z1JgoZkm7AgdKg02JUMKIbo1ujiQlRkSAiiRsJ6B/QhXGhW1f+ATQBE5SAstGFt40JMSLBEF1YiGi1w8gUlxHkMsO8Lqr6IghUT1e304Rv2zXd3/Od77znnLdGSTgqm1ckbTGsxEYSc3zNAOOYN4Ad5Vp0JsDaLOkp4E7B3IewMciwAHkL8DyAkrB6ALgLmAc4e3wu0xiQDdmZ78TeWAIeyEj74k5lEM52KmAY6cGg+XE/MLRu1c0IGZdaP6d/li7ZrgOukxUUnIS++gNufXbOgly2O192H9QNBgBKhQg7km1Jwhihc8BJQQ2YAgaBYUMZa1h1pksk9f8Ayfbb0JCLoEnsU5JqwFHbY0I/IM4C84ERYJnEcswS4FZgQXYr1GkNK836Ekmt5xhLfAzaCRzETAIDWSvRvFk2FsOSVgKrgfXAkiKCUppFJEAoq58XgG3AHpv9EuPlODrf0g/910omwupewRHgc2AjsNpovjogKrWbCwhsIYiBD4EPynG0r50frcTROeAwcDgJR08YJgRrQCFpH2W1ec3yg1hC6WlJjAG7bV6r1KLpTpK0HB/amyytHkKeAjYAI0phUBvRyS+/zXSctr0VeL1TiAZMLTpm9BbwCfDnbDI+yJ/daYoD2wS7ynH0d5F1oBJHk8bvAl91syDWO87fDTuQ9nejqFXiQz8BnwK/ZMqSu4IGOSLhVKFIgD2CA+U4muni3PS1YSswozTli8wRAZwAPjOc6mbzV6lFRwRfAmdThXQhV0tN8WAC2FspODeusMaA7+owhUTEWRW3/Uc5jiZ61JVfAA5gTisnSZBHrwTjkn7r4VA+BRxDTBWiWvXqZ3sc+LV3459PA/uAv0xBVysbkiezHOkVyrQhyUaAzkHUDM1N2UzRq6tVEgy300JdO9nTGrLMZmUPR/Ah4B7gFgqS37r3MixR6aFFMuTUNBzKa7UFOb60fkIjSVid1yOWm4EV2RRZCEjTGTEhsCoJq73IlYWC++3iQFpmKirAOkO5mwRJWF0MPGp7sdowXfK1KBLYZcMzaszYXVuPgF+SNNCOB5Z/HkkrYwismQhHl3UpGouAJ0CrGu2iip0QlbEY8yrWc4VDLK0OAZuAxzHYqvs0hQ5WDTvAqRS/kITVTQVCDCKeBL8ILPcsXKHcldOpd6LMm1sBbE7C6jzD+5U4Oj5biIlwNATWGtYJ3U3q/Lne6RUOImUakhr6g4aHbRYCQRJWvwDGynE0njMCQaaCI9hPI9YL7q1P1Q2B6aJBpyz3nFk2d0i8g/kWsT0Jqx8BR8tx5Gtk3G2GtYKXQfcBA7PxsjoBaW3wG4dmeAg8IvQY8DZw8CrKVAaeFbwJLEAMNHbfgWs6SxBdYjq7BLodOEn6UvVqaxCzCKWFNfMvnV9oO1WtK87zdbH3eeAMcPEafzeDuPDvnrTz1343Xr3dAOkWSIsB5j7mUMD1gAEKJEXAGdf7AvcFUsOTtplG/BwA24EfsdNqLfrl/1EEqgm+KcfR8cDwHvC9pLP1J/oiIGkV24XYzfW0/gHhg7VpVb73tQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo width="80" height="80" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0FC6ikJDsAAASPSURBVHja7ZhdaBxVFMd/ZzepWGlt2SrUbiO2i1oTpIpWoi8FtVoE9cEaM7Pz0ocIFQWxWKkFKVq1BakPgh8PPnQzs4If4DcRBOmDaJE+qEUrmyKy0aRmK0jUptnk+DA37WJ2N9nNsgg5PxhY7t45c87/nnvOnQHDMAzDMAzDMAzDMAzDMAzDMAzDMAzDMAzDMAyj9UgpnTkA7G2Bra9SxULvUhRQW2gvkyoWhpeSgImWWlOml1oGJurKETOtMAFMnh9RVQwAOuptb1XuXTNS+HB2oJTOdANfIrISRRGkmYd6fpAEiMLcdLP3qyoiMhOFOW3ShgAJVchH8/vR72dFkDnzEzUyrwgkK8UDSBULJ1LFwqUo+WbFc5QVPef52Y4mAr8BKAtSRvXzRfiwC6UsQtnzg+fmbRbIx3B+/qZaAqoqgrIhVSzM1DKWGil4wOiiuhfSbB140hkAkVsX4UK3SwEFfax+9gWrQLfrBY1uryWgCHipkcLUAhzoanch9PxgOfCQwinQELjI84Onmup3ymZgHNXfQVZ4fnB17cWmj3jLvaWqgnBfLQFnUiOF/EIcSBULUwLjbdbweRfQOyAvurEX+l1NbWgHCFtAJxB5wpWtT+tMfxWYisJcv4ggcEctAScbPLacabOAO13z2ROFue+BibiXcX1DmewFy4AkKqeBDwBBucrzg84qWX+zKgL86IbOuaayeo6ACssaLGSr2rh9BxRWAG9WDrtOdqyxdec25/9oFOb+BD0e71DdVWXufhFQ1R1uZMrtgnVzBBRIltKZexbixHh6Y0Lh8vYlnz4tcUAHK6L7LO4mdHh+cGUDC3+LqoLydVwPpS/exfKyO97MLtpKQbcDY/lo8GT8TPnHGVlftQuDflRKZ2R+H+RE+7Iv2wPShXI0H+Z+mh2PotwkcFhRUM03sBjdLtjj7sT7M4g7deh1F8TQAVQA3q0IfMj96q3ahTVeik/qPb6UzjwMXCttyz4Zcs4/63lBp+fHV7+f7QT2ClJGpNfzg66F6SebBEGEbwHy4WAZ2OdUe6UiSfYjEIW5RypuftuJf1fVg7QgAtxdWpf52715VAp3SSmd+QX0tYpXvXZwhQtuCOEsxJcgZ4G/gKQL6tGFdWDdgChRmPu1ItsOAmVEtnp+sNbzgwdQXY5ytPLeKBx835W7LfO9C19cpbX3AevjRKUtCeh5wTG3UocQdgAPVrnuj98A2O3OivWaUQJkNcgfleP5cHBGYThOC70TGHAZ9czcM6ROAvR72cs66hQ5gJkaHxikTbUviXKjxAX+QNwxawozDqwBssAbdcxucyL8UCXkrQi/gTwO9CAyFoW5L+ZmsJxR1bUi0pPQ1u7EZCuNqcoehCTIkXriOfa5SF6ax+hNKIjIyf/+FYW5UeA0sBmlQ2svxITEKbQxIciRFn0LLKZGFvYxVWFMoSB16mi/F3SI6E5gGHT3fDajMPe6wHegJc8PttUpgNcgFIBvavh2WOEUwiiqh2rMeQ9kGI3PgoZhGIZhGIZhGIZhGIZhGIZhGIZhGIZhGIZhGIbxP+NfTtmklCc4oeQAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:Logo width="320" height="240" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAUAAAADwCAYAAABxLb1rAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAAd0SU1FB98LAw0KLmQ47LMAACAASURBVHja7Z15nFtV+f/fpwulLXtZ2wEqDcq+yb44KqvAsMhmMx0sBPyCMJpg/LEpgiIgRhIYNpFgYTopKLI47IgwghQUsOxb2KRAoZ3SQhe6nt8f54kNmXtvkplkJmmft6++BpObe889957Pec5znvMcUBRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURQFwBQ7oLshdBFwCjB61a4qC5iXgMSo6dmb9dVRlJVcAGeNCb1kDNtqNa1QQQvGWHvjqA/eOlWrQ1Hqm0FBlp+KX88Ow/UY5pTuhtA3tDoUZSUVQBn2Kt52s7WWH2lFKMpKK4B2tFZPgCVo+JpWg6KstAJotHaCsVoFirLyDoEVRVFUABVFUVQAFUVRVAAVRVFUABVFUVQAFUVRVAAVRVFUABVFUWqbITVWHgsYl3EAgP8CsyzMN1iwBgxrW8tGwEbuGPcTNHJbUZR6E0Brscb8T8FeBR4A+4dR0996rdhvu8eEGq3hFAPfBBr0cSqKUi8CaMEa48y42wycOmp69vNyTjDqg2wX0AXQ3RDaCbgS0CwtiqLUtACKwWfuGjU9e3QlTjhqenYa0Ng9ZtxGFnMfhl3M/66jKIpSOwI4B9hz1PTsG5U+8agP3voY+Hp3Q+hU4IZV8aGOb56wp4ErfFwOg4wxe2U62leqZA7h5pbNgNvBLvXucs3nmUz7wavKOxBuntABfMX/CAPwRKaj/f/V2HN8HOzg4KPMlExHe1u9CaCzxqx9YtQHb+1X7YuNmp79Q3dD6I/AdGCjVUoBLetgzF6er45ZWW+Zaw3s6neHFgiHW3bIZNpfWDVeAhMuoda2A2pGAMPNLecC+5YwaBsBVEQAB/Xf+4kBMv0hfnkiuHTU9OzGwGuavGpltnZaNjBwWJC7wxjA2HtWlfqwJb3wZs3xzS3hmim45aeUlmZux0pdsr8E0ABTRk3PNg9EvY6ant0aw1uawm+l5YelNRyzaTjcstoqMAQImdJc39bARTUi2g0Y1qVEn324uWXDehLAqaOmZwe0pxk1PRvCmrkqgSsX45tbhgIXltpwrOGRVWD4W2q2cmMhFHZ1ONAujHvLGk/CpvUggBaYM2p6du/aeC8YKzPDqoMrS1OHI8t8JfdY6e0/2KOM+gPLrTXwHLcu42ALbFnrApjz++1WKy/GqOnZOdbySzQ0ZmVq7ZN9vlnq1dEZzNDx4ZarVvJOYZ9A26mnVXzgAA9/L7bW9rRCrfUrs8FyUK0LoLFw/6jp2WwtvRzrf5C9EPhQlaP+CTdP2AvDMJ+vD/bp6KwxK/2Oh9t7fLbYwhIfwVxzfHPL+AEs75kY01PojHnB11gxtiKiXS0BtMCy9adnD63RF+QYlY+Vwta53ufdm5PpaP+79R/1DR8fnnD8ytkptGzs89VCA7f4WFTWwCUDVN6vYFnbeAvdGQE/rcjS1+oIoMVYqNmQg1HTs0/h4gPVF1i/DT0E7OAjcM/Jf3T5Nnhj/riSVk3Ip03OB27CWuMzWhs7vnnC4P73YPCQn0Mq09H+RNBAP9zcsnlNCqDFYqC5xl+Un7uOT6lTLrD+HdiZ8iZGrfVsXgYYEW6esBLufW238tGLOVj7rMXfLDaY2/vdhreM9RQQay+T/zcv4Oc1KYDWGJMdNT07v5Zfk1HTs5PALFEdqUvrbx2LbekxbHLRvzMzHe2vSvN6NXjli3lq5dM/7xVAQHcmM3kxxjzhP/Kx+/fzc/wtpudqNGuswZhrxUKc63en1to+B0RXQwCNhQfr5HV5S+WkLjlJMqgVmjHGWntH3hBqEdjf+zV4ix2z0tWMwS/k7OMVIx+/QadZc3x4wvf6cfh7Ot4z9WQ62t8XMZnr8/yMMeaAmhNAiwVbmXV6VX8A1t5lrboB687IwV7h1YithSmZyacVmBMX+DV4gxkUbm5Z2ZbHbeUhNGB5QYa6TwYsk7PGmMv7yfrbxsBIj2djwf5sRYF4x+/5Wdv3meCKC6DBsP4H2dfrorM0psMYdQPW2fD3SOM3vWt4pvCzTKb9E+B9HyvCQmXiyWqjbrx9mpJt+Fmxihcba67PBdn1aL6wabi5pT9WiN3vKyHW/CGvQI8EtN/h4eaW4TVmAdZPjN2o6dmXVFLqjrR3whcLcKKPpXCAjxVhgKHh5pZzVpLx79d8JAXI6xwMSRu8GODO6o++fMNYZkunlePRgBEcBKb8GgABxDKnzt6aBaopdWP97QmM8m5P5p0Vkx9fZkpm8hsBEU8W7EUrQ/1Y2MrrPq2z/P4nKpmO9jeAOfiOhe23q1nO8c0t1xjjqz2HfcmC72ifFjCEw2LH1tYQ2LCwzt6bRSotdcNvrc/QzWB/UUQcjvN7ZS1mtXB4wj51b//Bnl6GnbHM6nmsacH4hYGZNcLNLSdUsagn4d8j/cfjs8/8DFuD6VOegUHVeQ6KUmGrIdzyFazd1/Qc/1pgbqZjcnvwS2nuCXhhLcb8bSWwAff2ucEPPWzmvwU0VYu1ySpZ8bsZ7HA8Jz+40s3c92BWwCm/VWsCWIcdp1LzD8kQ91wvKrkmi/0+09H+hbX2dz6Wh7Gwejg8YWSd11LI2/jtKYCZzOQvwF7tVx8Ys0mVxun3+aZksPza51efBJyxtixAC2vWmd9khMpLbSMzfT/07KysJdPRfnqJKvpL67P6x7h34dm6tZCbJ4wJ6OBf8fnqCmv9V0OFm1s6q2BurOc9iWU+z2TaZ/o00oeDwtXCzS2jaskCXL/Ohg2rqcTUPKcENKiuUk8ypaP9MyzT8PM/GbNlvVaQsWwb8I7/y8cqfsfAp371YW3fhpceQnVjgOYcGvCM7/ULVxNhHFczAmhg3Xp5abobQocaHQHXfhdlCcjfZyaUOZY+CN/AaAaNb55wc30qIFsFfPlMQH2cgK8byI4MN7dULmuOZYJP/CHW8u8A98XTQYIDbFFLFiCzGkJH1Mfw156q60Bqfvh7lF+suoWXMx3t08s535SO9pnAcn+PiGmux3qysLvPO06moz1oyec/rK9BbCwV2n1tfHPLnhaG4T2JddOUTPui4E7QzvXWPwPwjZoSQBOcx6uW3ppd1f6reX4X8J79rJfn3NfXHoLB4eaWU+vPAPRJgmD5NOh3mY72RQaT8nGxGWDDCmnCg14dmfNB2qJbcxrDx/5D9d4ncajWLPDX6+S1aUCpZetvD6/hjaTBmpnpaL+rl6d+JiAs2gLX12F1beFjxX1QgiWQ9HOLWvcc7q1A+db0EbZFmY7J3SW01Q99XRfGfLWmBNDCqO6G0P61/LZ0N4Q6dBlwjRvolgs8e31rDdbe2NvzZjralxjLOX6mFJZB45tbtqqjjmJTn1lSi2V68fqY/F9jjKeFJZsmfbOPw9+MZ+5NawHTVKKmPBz0Zbi5ZbNaGgJbC1fVduOyR6jE1HSjHm2wh3r0+tYYYzOZyef18SW9KugFNpZn6qir2M5zltRiMLxR4kmOw/rtv8GIcHPLcb2uastxnh2ZW8r2eIkN9p4igtOrmeBqDYGNgW26G0I12Yt2N4R+C6yhMlPTnOUb+GztX/t68kxH+0LrMpJY/0Y/oU5CpMx2AcrxdIkGwb+sCXIM2F65BcLNLYe4pKeekx/tUzomf1HKeaZkJr8QVHxj7La1JIA5X8oDNTq0+rGmwap1o4af4JXzDwvGfL9CVzke/5VABswTdVJbX/czvWyJluyUzORFBlI+/YGxsF7vHqNvZhljrf1xmeeaFfCsGmtLAN389ObdDaGLa8z6e9nAUFWYmh7+nuFvmJmnMx3tcytxnSkd7fMICAQGdg2HW+qhp9zDrxG6TDglC0zCb2GIMYZwuOW+8mXAe9tSay1TMpM/LVNNP/HNYGPpVQabqq8Fttae390Q2rhGxC9qrd1GY59rnsu9lktZZwGeW+Fr7e7r+3Ld+BU1byx7bSzkvilLYKZ0TP4A+CjALVDWypBweMJf8Z+5PaRsMTW8h8/KBQvrjQ+3lG3YVF0AJZjynYF+SWaNCW0FJHXoW/PW3xF4r8+2Bt6b0jH50Qqrx9sBHaIFouHm2rUCw+EJmxsf350tYQbYg6MCOoTVw80tx5bR+A8LsK4f68V4ujPoS2PKnwjpj2wwBhjW3TDu04F6SbobQpsYY19B9wGuA+wvfUYSBiq/10wmM3k5Ppmk5d21Fo6s2eoyZge/LTMw5v1etNb/FOkQSgo/Cje3HCb64jX50emT9ir4zTD2UQJMdfz2RB5gAZQXyazd3RCaNwDity3wgTwHNf9q2foLt+wIZkefxrwk09H+uypd+taArtFg7Z01XG07eu+PbI2h5BCYvGFw+xLgN/7t2K5d4qn+6mVwyMqPCb250Skdk18LUhgLu9WqAObEZ2R3Q2jZrDHjdugX8RsTOt9a+xK55LFKbWPsz33tHOio1mUzHe1LMEzyN7IM45tbanXV0I7GZ4c8epvey5IMGGgSbm65v4j1N9j6tDljDJmOyZ/14X5nBPRUZWevGTIAD2wQxjzf3RC6b9T07GHVusishnGfABuY3J5YSm1bf80t61hrjwlw0X4/3Nzy/Wo4MWxuoGsCMyQ/R4XWxVa07NjdveYFxNfdKwHMZNo/Ht88YYbBbOxlDoMpJjQ+kx/WWsv3+na/zDDgN6m6Xy1bgAXWKod2N4SWdjeETq/kubvHhCbNGjNuOZgNZGig4lcfnFNkgkq2gKj8/4zLgBx0cWMwG4SbW4bUWqUZzGZ+SuG3SVSJZz7c+hrjDAuHW74b8OPvGM9wFWOMMXf1UTveDPo23NyyVs0LIP9bYshgLNd2jwkt7W4IXdsn4WsITe1uCC3D8H1jTM7+VvGrH87G1vAklcECd9dSkcaHJ4zzS5Rs4fM+3u7zRbqjST6W/In/66h68kCmo31xH2+72OKKspLaDhrYd+p//fpg4PRZY0JH9+F0u+VZeyp89TT8DbecnjNnariYxsKh42vICjTG7OBntxrDe305d6Zj8lLg1/hHTvgtJZ3kI8gA4ytw2/cHj5Ht1+pGAL1qqNc/typ8dYvhIp83wK740x//cu+St10lo4pYDdXcTgHf/bcC50/6tSlrrQk3t9xaYP2tgX+2bTId7X3eMzzT0f6R9csq7aIF9i3nfEO09SkDPIw7BNjA54U2UzraTT+XZ4gxZknAIZeHm1uuyHS0L6txAXyzAmLTHQ63/BfDZp6KZjmq4HndZbz97tbChErdtLHmQwxjPIpkgLLWBOu2mMpAD+Mu9LG4rHGzif3KlMzkpVheKnLYXjVSfbsEDIf+XSG1Oczr8RgnN8PCzS0bi/U3yMD+PhagMfDnCg4Wg5K8bqMCqNQF4eaWrwF7GO8ZWAOcPUBD8v2K+GT+USNV2ODTqwD8p0KV8VrQBLmF3DA4YGMi+8+MC7CuUKdpXwwoD+ObJ5Sce0AFUBlIfhHwHj+f6Wh/bSAKlelon2OD3MkWM755woBu/xoOT/DPten2Sn6lQnWx1FouwcdHa6zNWcPpgPqqcLyvecS/7wKD2VoFUKl1628o1mdW0KnPZQM6NIdjfcNyDNZgnh7I8lkTkATVmMouOTX2t35DW4wZGm5uGWSt9d2ZLZOZPLei9w4PFTlkOxVApaax8KuAJFRzMx3ttw5k+TId7X+RsBzPrNTW2i3CzROGD6BA7xLwdUWzL03pmDwn4JwGiPusorHAaZW+9ykd7d3A0oBDSl4RogKoDFQDjuPvaLu2FsporZ2Mbz47LJiBLGfQDPC7Vbjewf7eCi4znptXYSgxe0wvOtD3A77bWwVQqeXh7/9Zawd7i4sl09F+Xi2U0xgz0V+kjQEmhptbhg1Q8Xb21SNrs1W43tvek/V5yxl6Fua56oUL2Q/9no2hZ4iMCqBSS5xtvLN4WjC310ohMx3tyyx2ZpEZ4RMHxjr1SQhgAGNeqEZdGMyFlLNkwZgDqzeCMNMIWPgwPjyhpCVxg/zNSM0dWtwKV8plfHNLI/AVz5fXJT29oKaG6pY9iywwuiHc3DK4Xy3o8IRtiiQ2f7Y6lcEV1m/TEI/Wkelon11F98SDQdc2xpQUDzgoQGGf1kYeKH4PajX0pg1xoW+dGvOfvmUwqYIVmJn8joz8gtrCDv1cizsVsdZerJJF/LnBvFtC67DW2LOq+x6Zv+OXCcJJ9C59HQL/El1b628YWH6t1VCm5dLcMgb4pr82cmlNPmzDWUXawtR+7kV28m38sKDK1z6gFHXCmlR1O6b2+RizKMBE3KdPAjhqevY+4Czp+tQSzFUrFmvt19f/IDu3VgtpMENqcuBuuTrIaMh0tP+5Fusz09GeLDIc+9+SsH5in4DkrTOqfO13io6N4K0pmfb+eNNmBfRa+5dygsBkCKOmZ5PdDeNuMZgzcOsfl1ez1Zo+PDxj7ANBKX0r0HgNhtuw5k/rf5BdWMsqncm03xNubhnkZ2dlOtoHRgYNvkk0p3RMrvFO1g7yMwJdmvd+rFNr9/V71atdjkxH+3LA+O6U14/vV6ajvaGWd+xTFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRlL5itAr6zvxJo8cBNwF7AZ8D1wM/GznxQ6u1oyi1yxCtgj6L3yDgbmBb+Wg94DzgI+Dqmi58OrshcF+R92A/IqHP9UkrKoCKF3vniV8+p9S8AML5wNcDvl8KLNdHrKgAKn5s5/P5tgNs3a0B7AJsI/86iYQezvt+LHB6kbOcSyQ0Xx+xogKo+LG6X93OnzR66MiJHy7pR9HbDjgaOBTYDRgs37wK/KTg6N8CQwPOdg/wO328igqgEsRcn88X9Iv4pbNrAd+XIfcOHkdY4BQioSV5vzkQODbgrG8B3ycSsnm/2RY4BLiJSOhTfeyKCqAC8B+fz6dVWfjWB+LAGcAaAUe2EQk9mfe7ocCVAcfPBg4jEpqd95uRwJ9kKP1L0tlJwMVEQh/p41fqmUFaBX1j5MQPpwGPe3yVqpLwrU46ez7wNnB2EfF7GzfRkc95wNY+xy8BjiISer3g89+L+AGMAH4IvE06+1uxQBVFBXAV5mhcHOCbwLNAZOTED/9cBfHbH3gBuBhYs8jRS4FmIqF5eb/fTgTQi+VAC5HQ4wXXPAdo9jh+dbFAXyedPU5fAaUe0UDoeiCdHQb8BvhxGb86h0joN3nnGAw8Cezuc/zpRELXF1z3aOCOEq93G3AakdAcfWCKWoBKpcRvc2BqieL3FnAOsPmXxM9xQYD4ndVD/ByPy3WfL+HaJwD/IZ3dQR+aohagUgnx2xO3ymTDIkf+S4bF93xp5nbFefYDHvPp8M4lErqshLLshfMnHlbkyAVAmEjobn2Aigqg0lvxOwD4KzA84Kj/4uL7/uIpfCvO9TBwgMc3USKhK8ss135AG7BjwFHLgZOJhG7WB6moACrlit+BwL0EBypfBZz/pUkO//PdCuxZIFBnEwn9uZflG4KbALkIWC3gyJOJhP6oD7QyxKLxicBEYFIylZi0Et7fAbiVVdckU4l+WUCgcYC1J367y7DXT/xm4mZrHyz5nJHQ9ypaxkhoKXAZ6exDuPjAcT5H3kg6+xmR0F/qvGGOAEimEgsGuChjgUZxZ9Rzfa4NLPAQuRuBzYGXgL/1R1l0EqS2xG9ToDNg2PsCsHtZ4ldNIqHncBMrjwS8X+2ks7vU+ZN5FrhWX9CKiN9YYA7evuRLRQT/1V/lUQuwAsyfNHqsx8efjZz44ewyxG8YcBf+Ex5PAIcTCc2tqZuPhGaTzh4KTAa84gGHA3eRzu5MJNRdgQY0SCzO4cBHyVRipscxI4EtgMXAm8lUYrmHRTc0mUrMlfNtCQwD3kimEl8UHLszsBXwn1g0vo58/HkylVgWi8ZXx8VDzk2mEjYWjW+Oi898Jf+asWh8tDzXj5KpxMdl3OtQ4Ku4APU35X6Cjt8CWAt4J5lKzC3jOhsAY4AvgBn5r3a+lSbl2VI6tjeSqcRij3MZYDSwAfCJ3HO+f3qC/B0p9bk8mUp8Jp9lcOFU8z3OO0SuPQR4O5lKzPexLJckU4kFee/AInkHPH3kFfcBtnY2boFLEbU98BV58COk4J8B84D3cSEbrwJT25q6ZlfguoPEGtlb/AgNwNryYi+Sa88E3pAe/Sl5scrhi7amri88BNCrcq8cOfHDaBkCmKBnwoIcjwOHEAmVPwRz/ro9pV62BjYDRkq9zAW6pXE9AzxGJDSrl9brYHmBj/c54i4ioaP7KH7NuCQOm+R9fFsylfiefD8Y+BVwltwfwIfAD5KpxL1555kkDbEJl7x2s5ywAWcmU4lb5LiJuJRmIwuKsnMylZgWi8YvBH4B7CR/c/c3LJlKLI5F418Bbgb2y/vtA8CJXsJdcK+H4YLrcx3iq8D9cm8XJVOJC/OO3U2uk1vhsxy4BTgjaNgugnEzcKTPIUcnU4m75NhTcbGo6+Y6eOC8ZCpxTd75GoE/SrvP8T4QSaYSD8ei8T/g1qzn814ylRgrv5+Gm1zbOZlKTMs7bxQXxpW79mLgGuCcfBGOReNzxHp8GOefzo2k3gSOSqYSr1TFAmztbBwNnCYv/9d68fuXcNlHbm9r6nq2zN9ujItVOwnYqMr2zkXAhVUY+jbKi+037G0qW/zS2RAQBcbjkrSWwnLS2b/hJljuC5xZ7mkJLiOdbQHWAQ7yOOIo0tmJREKTeil+OStzCfAH4AMRnqfyDrsAOFc6uKuBUfLZHbFofKdkKvFq3rGDxd1wr9zvHmLB3hCLxu9LphKzRDz/KnX4bxF45Nr53C4dbicwW8RvOPAQEJKyTMUlk2iR4xsD7rUB51sdIcdOBQ4EYj7HPizH/lIa+wTcZMlC3LJFPy4W8btZ/ntr4C8iMAdLPRKLxo8FbsBFHZxPbhINro5F4x8mU4k75Xy3AhsDv8Ytw9wSl5koF0c6VTrj7UTcXxQhDXrupwBJ4FMp4wIgInWxusf97S8dzvW4pMTfA3YWF8Y3KyqArZ2N60uln0LwjGUxtpN/57R2Nj7W1tT1rRKuPVhE4xcePXQ9+f1WA67zscY/AY4oa9jr1uYmgJNZkQ6rVAaJeB0EPE06eyqR0ItliOBi0tkTpBfe0uOIBOnsPb20Ms+Rv9FkKnGtR0MZLu/DYuA7OQsrFo0vFoE71aOTuT+ZShyZd44X5T3cHbgvmUo8JMPX8TKs9VvfvRGwazKVeDnvs+NE/O5IphKtuSFeLBrfDvhGLBrftuD4fFpE0B5MphLHSdmSuMmPbxQce6aMdH6VTCV+IcfeLo0/EovG4wFW4P7y92fJVGI6kI1F44+J2C7Mcwfklk9OSKYSj8s1XgW6RIDulOHxhtJB/T6ZSrwvvzk3d7FkKnFTLBo/Quq4M2ddFuFn8vf4ZCrxN7n2H2UE+YNYNH5xMpX4sOAdjiZTid/LsX8WMd63oj7A1s7G70qvMKrCkpAt4dpria/gkJXAhfhj/JMTtBAJvVeG+O0mPfimFSjXHsAzpLOnEwndVIYIziGdPVZEcFjBt6OkFz+tF+XJhfH4zSjvgEsMMQs4IxaN5z7fQv56jUwKJ5Neksa5Wpllm+whZnvL3zVlqFzY5rYC/AQwN2l0d5542Fg0/pCHAOaG1+MKrrNQrPHNZfjsRS6Eam1geq68ecPonL90J/nsoFg0nhPNEXn3QTKVWBKLxh8Wy/HlWDR+Iy6c5a0+uDxGS/kXkDfRlkwlZsSi8aki4HuLlUyBmyF37DuxaHwhPhOLQ3opfhfJ0KIa3F3k2iPE5N+97qUvnV0nv4csIEUk9FAZ52qSTmF4BUu4GpAmnd2wpNUiK0TwBdLZc4ErPL49hXT2CiKhN8poCOvkRhgBkwgbyN91Zeifz1xcXsRCCs+1qJf19I6PVYhYHrt7lGdYwPlyRsUMjxFBIblsPEcAyzyuE9TGb8Ilzu2IRePXi/jvKUPfF/LqNTc6afU4//ICq/dC4P9kiBqNReNp8UUu7kW95lw3Mz0mMWYV3H8+hfW2uGIC2NrZ+LsAfxV5vceL0qP+Fze7lCvsptIbb+MxbF6If0hFjj8GiN8C6Q0eBp6TSlosjWIsbte2o4FdA87/iZjMczz+PVZhCYzlOXa/5BimZxqrIPH7pviMVi9y5KfyTD7BZYtZT6zPhiK/u5R0dkaZ/rurgLBHXQ+WRhIu41yfSeMeHIvGN0ymEl5CkJtIez2ZSpS6HUGlgm29zjMzb3h5RZnnm10ghIWCUFg3ACckU4n7yrlIMpW4XiZbDhLL/FNxx/w8bxY7JzTLgA2DhCyZSnwO/CQWjV8sIvgzcY+96tMZFiP3nDeKReOmQAQ3KLj//HKU3JENKVP8zioifi/hkm3eUWxmVyy53XBLtJpwsz8PtTV1LQz4zffwn2W8Azijralrhsd3c6SXfhS4pLWz8UAg7TNU/BjYp62pq7qbAaWzI3DJTL04q+RJj3S2QUR/9YDOqB3nFH7aZ63wVvLCnh5gmVxPOvtsyT5BNylyBvC0x7fHk86eW+rwPplKLI9F4/8RMT1GGmnOOhycTCWW4RLQzge2jkXj2yVTiZcq/MRWL/P4J8TveEwsGr9Sylgqz8t9fgcXF5fDa+LkcRkGHovb4a+cIeZ3gMOBU5OpxI0+dT9f6n5n4Lu4iQ6/8w1KphLLk6nEp8BlsWh8Fm7CavsCawxK8NsnU4lPYtF4zi1xUM5lEYvGNxZLdTluYqXXDClD/PbBoF69kAAAHQlJREFUhSB4MR8XwnFDW1NXSTOHbU1dC8SJ2gX8vLWzcfOgSmntbByCm4b34mrgR2Vc++HWzsZdgX94+Ia2x+W/a6/yALjFx386lUjojhLFz0g5RwUMzY4nEnqmiFi9BsRIZ28A7vTxlw3DrezYi0hoeYki+C/S2dvpmX5/MM55/9My6usK3CzslbFofEeck38bGdp+T2K/fg1cAjwSi8avkaHQGPFLXZpMJXqToOG13BAzFo3/Qqy9vyRTideL/O423Ezp3lKeP0l72wrYKZlK7B3w21twEw/fjUXjt8hoZj+5Dy9L+xTgJAlreUB8etsC6+VP8vi4OADOj0Xjh+dZVK/hJjJycZu/wM2G/zEWje8qFt1G4o/szAuFeVcmHXK+zdwM7XN518zV2wUiZCOTqcQvA8p4iTz3W2PR+LXit4yID/LGZCrxQV8a4aASxW+YWEyDfEz9fdqaun5fqgD5iNJ7bU1drwQccjQr4rUKe9pouddua+r6RKxJr575dKrPST6fX1zGOcJ4TO0LrwJ7FBW/LwvWq9LQ3vU5YvcAC9yPX/l2AC5GsdTh2hTchNF8sVYvlLLkzwBeJqIzFBey9Hucr7qBnqErpV73KVyYyHC55q+B9Uv43SKck/5uqdNrZHR0mo8vL/+374k/rVs6yiRuMucEj2M/FMtwqlhoN4ih0uzjmyz0jc0W99CR8q9F7vFxiaskmUp0Sl1/LIbOjXLMnrg4v3xXwFmiFWkR4evl3/+angjkV3HRCq0lPPcfiHvsPBHETeU8Z/S1EZa6FO50H6tgAXBgW1PX8/0gGCf4fP6TtqauZb0U3Rekpy5kLwnortbw92u4WdZCXsEFu5ZyjiEBYvk5btXIzLLL5n4T5J87t8zzvSA+2UI28rFoghrDVeL72VYs9fWTqcRZed/bZCpxOS4cYxtxq4xJphINyVQivyP4ofhe7y24hOfnyVRiIm42cmdgg2Qq8c88wV03f0he8LsZyVTiKLHQdxJ/6zryWbF7vQcX8L09sGUyldgZNwO+rlw3/9iXxaLcUMr4VWDtZCoRDRiu7i9D5r8Do5OphBErf5y4srYmLzohmUr8GRfgHJJrbA6MSqYSf807ZhwuDnAH+bdeMpU4PX81ifhvd5Bzbyfim2M/ub8XC+7vD2L8fDXvvD/y8EdujrdP3e/z4itBxPp7V26skP9ra+q6oR/Ej9bOxk/yHJ//M6fbmrq26uN5j6HnNDrASW1NXZNKOUfZK0HS2bMLX+KcmBMJXVGiAIaBDp9vzyQSuqaPIv1n/HeO251I6N9lnOtYwCvzzI1EQqei9DsyUXE+cHj+Khn5rkuGt5snU4n/rsz1UMoQ5Cgf8XumwEFbTfEb7SF+UJlZ2X/4fL4bMKlKt9Tk8ZllxUqDUjjZ5/P3ZOjXV64LEMDv4lZGlEqn+JYKQxYOQxkocn6538ka4plilR8t4veXlV38Sh0Cf9/n80urPlP6ZRPWz8/VJ9qaumaKf6GQDatyJ+nscLzDeJ4iEppR4jk2Ab7t8+1Nkq6qr3SxIlC2kLKGrkRCi8gLTs1jE9LZr6oW9T/JVOIOnE91MM7HOAXnk1sX50cNrwr1MKSI5TXcp6HNpEjAcoUZ4fP57Aqd/1N6BkquV6V72Q3vZYMPlXGOAwLcF3dVpJQujOU5eq48ANiedHaYCFupPID3BMq+uAQV/Tn8Wwe31GsRqzDiU71KMuKshWS1WZXqoNgQeD+848Lu7u3EQy+xA1AP1WocO/t8/s8yzvFNn88/lEmHSvGCjwDmwjnKmfx6wufzHUsUrRtxS91aepstOBaNH4cLG9lY/v81yVTizJWpQcua6A7g/WQqUdIughL0vEru5ldsCOy3YuKRfi6n38Pp8zC1tbPR+Fh73VW6F791v+VkwfET0RcrXNagWeSGss4UCb2Jm50uZJsSGvXquOwmJ1BCCIrPOdbDxddtjJv5T5dpddea0G0Ui8a9ZpM3x/nxIjrQ77sFuJPP58/0cznfLVMIymFbn3qo1rDMK7zmEyKh0obzLvh5G18LMJ0dW8GyBmWT2aAX53uVnv7Pr5RgoXwRi8a/DayeTCU+6uW97IJbzfFULn9gnXMmbqmZKair12LReBOVcw+t0gLoNfmwmOIBlhWlralrdmtn49se4nFQa2fjkLamrr44/Q/w+XxqlW5njMdn75Xx+w3xX652Ev4B1pVmjV52ZLuXUB9erEmB7zQWjX8LsMlU4rFYNL47zp+4DHg8mUo8l3fcoLzOcpBYTguSqcRDeceMwi09Gy0jjgclIDn/euNwcXkPyejpOLFIr5UlY/sCqyVTib/Lf++Jm0h6IJlKvBuLxtfARQBsigvgviuZSswruMZquNUjX8Vlc5kO3JOXNZlYNL4ZMkmRZwW+lUwlXpS0VEO8nk8sGt8UN/O+JvDPZCrxZCwaPwSYl0wlnpBjRuCWnRXWj+fned8djovpm4NLJTZ9ZRgCe62V/bCf/X857vWxQib2Yfg7BO9VH5/i1lhWgw09LcDSGV0nnScl3ufqpLOliGkHbpnelwwe4O5YNH4dbs3x74AU8GwsGj8777iHgMvlv3eX89yQ14CPEHFuxy23/D3wpmQizqdJfnskLlj4Jjlvrj1cDHRKZpXHcSsyrgNei0Xj3xcXRUau0Q48J8vXcuUwOL/ro1KG38h9vy6hKsSi8S1ldJIzBu6Uf7kh78jC+5PffQe3DO06KfM/ZbngPXw5oH5Dr9/7fS75Dd8Qt0Ku7t6WbNp1L4Be0dMfD1BZJ/t8nmjtbOxtKMVF0tMWcnNbU1e1JkG8ZoDLcUCvXccjjtkVFNMca4klFpZh7oXy+YUyIQBuyVRuxchjYg0eKg24ARcCMgKXnWcnOdcCIBmLxr0mgW6U73+MS/eev03CCFz85DG4Gf+/isU+CZeteW8ZdXyASxp7fN7w1YqAnybW1KYiOhvjtiFFLMI9C9xAO+O/Tp9YNJ67/nDcuvlcYoOjKD9pbv55B+MWEYyRutsIt/zvM1xm7c3qfQjslQHji4EoaFtT179aOxsfoGcS1LWBrtbOxuPamrqeKNHyGyz+k/M8vp6XZy1UgzU9PitnCL9aHQug32z+OvRtFvLXsmY0t6/ED8RS3gJ4OZlKvB6LxnOTT3Pz95tgRfblW/IyPj8fi8bXx80Yn0HPYPnZwN7JVMKvzJdInB2xaPwiXK4+gJNzQ0PJk3cBBUtMk6nE9QUicx1uUmNL+X4hMC2X8LXgXvz4llhwrwM/EqGdJuFAN/Wh3hul/E/k1d3fZcb+bBHYq+pZAGuNn+LiEgtFYGPgH62dje1i4v/ba5je2tm4jvT8/w//8Iuz25q6PqriPcz3EcG+WJD1Tl/3252Wb0XFovGZIoCl1FUuVdNTBZ/nVrp4TQTeGSB+yPC40Or9tMAv9qlXG4xF41/H7WOxtbwnYyrw3HOjnGcK4vym9bHed5C/IUmlnyMXITCm1l+8uhLAtqaulyQn4dUeXxvgRPk3r7Wz8Xl5+RbKUH6MvFRB659vbmvqqvb+r8v7OKydH/Ddz8Wn0x/0JruKX7qzxX0sy6cVaAOLPEYC4D3hVGyG1St86LMShpQ/wPnQFuOSYkyVYeW4PtbP6j5lKGeL1aEBz3NhgQU/RzqBN2pdU4oJ4Bcew+C1BlgEr5Gd4H4WcNgawD5lnvpm+id2aqaH4JUTUvJFoBBEQtNq+H3z2rVvWZkNsdLk0jkV+qvGyt/ezGb2NnA/55I5VlJQIXn6JlbgnYOek5obl+Fq8bLmcnXzUikZbmqRYpMgXsHAm9SAJfhzXBLI+RU43SLcHhIn9dPsttdMaDlDhaAGuWmNv2+jPeujnO03K08undNE8fvlNuHOrRC5rx/LknON/FfKYWQ47Gv1SmhOMXI+zP1zs8lCs0+bt8DGsWj8a3nl8NrI6mFcDsCDZeieb81uJuExdS2AXo1t49bOxjVqoOw34Z8OqhSW4EIRtmlr6rqyL8lcy8QrhnJzSZFfCjPwTuIKvdiTuZ/xKt97A1mgZCrRhdtPZXPgjVg0/gBuZ8KDcZmR2/qxOI/J37tj0Xg78B/crLHXu5mLU/1HLBq/JxaNXxVwj2/hZrqH40Jv/hqLxp/DY2227OvxN5yraGosGr8PF8B+EAVJQyQZ63liLU6NReMPxqLxu2Qi6j2qlVCkHwXwbZ/Ptx3IQsvytUm42b5ymI5L4vBDoKGtqevEtqaut/u5+F5+EYNLDlkcl+nlNZ9vd63ZNy2dXQ/v5XOlZvR5ApehJp9n8M5a4/X5LPnMa6+QZuBH8r7vKm6GFLCvCEL++9OF/8qkaR7X/UI+e8rjXeziy9vAnobLmzgCN9n3Ki64+yZ6TlichvMTDsNN5ORGFkt9rncKLtvLp7hYyHfkM3zqY7KMsHbBhe98U9xETxWIYAI3S/0P3KTIHiLYSYKXUtYEpojQ+CXu/GlbU1diAAXwV3j7AB/GpUtfIL3dGmItzQc+rlZsX1kJUdPZI/HO2HIWkVCyRDG5GTfZ48VWREKv16AAHob3BE3p961UlFg0vpNYmV3JVOKbq2IdFJsEedrn8yOkNxkI8dsJ7/i9W4CTB2iVSjk85fP5t6TXLIW/Bwjg8fjvwzGQ+OUvnIqi1OgQ+Em8Y7T2be1sHDtAZf6JR7lfAk6tA/GDSOhjGVIUcqAkSy2F+/EOpwH4AelsLQZLH+Hx2UK+vGOYotSOALY1dS3GexbMUHxz9GrhlUb9d1LWesGrTlfHrTEtRUQ/QfZI9aCBFdsR1srwdxfcZjo9XRaR0GJthgPGQlxOx+yqWgGlBELfjPfeEKe1dja2tTV1vdmPw9918F6f/Hyd1fs9uHWkPaSNgI2nC7gOl73Ei4tJZx+Q/X5rgZMD6qGukQwvQ4BFskytbpC9jXdalXuAUgTwPukhCnvwocAtrZ2N32hr6lrST+X1G+JugXPm1guP4jb2LoypPIB0dlsioZdLFNF/4b2/yEjgHtLZbxIJDWxaonR2HbwDeRfjvVNcuQL0OG4WdL9kKvFiBc7XIaOM5txuabFofFt531/J34oxFo1/hRWbgH+HnrPUXuefI+KzTo0L+w/lnk6vl9RWFR8CyzB4Of5O9T2BGyUspeq0NXV9jvcSrLbWzsawWIi1TyS0DBeD6MVPSzyHxflD/eIXxwFPkM7uXiEhW5909keks+Uubj8T7yVwdxMJVSIN+5q4lTWDK/R0Rsr5hooQDJcRxr/J2zdGgqXbpVM+XOIJS2FtaiijTywa/45P1paTcTn+dmclptS1wO0yPPNKDXQiMLy1s/HktqaueX0c4m4MDGlr6grqcf6ES72TzyZIULTsHzwP7/TrOZbi1kV+JoL6Gm529tl+3OnuOhGwwobbQjr725KswEjoCdLZK+Q8XmwOPEk6ewNwOZHQu2WK3jhceqPDcEkkhpRi5XxJNFekcerRadVJG9lRntHDyVQif8nevrjUcPuVmJGlFq28cTLCO4meW8CejIuJrHs3RZ8FsK2py7Z2Np4ivaBX73UcsFtrZ2MMt2FSyasqZOP17wATcDOFxxO83OsSXKCmX5T5hvQ+An1ma2djBriyramrulmvI6F3SWfvpKd/dRBwBaVvPXmONFK/zNaDcUlfTyOd/SduP5dpUsdzxNJZkxWZR76GSxqxC/7bkZbKL33el2eJhB7vRYMdLPWyJW4N7/0ErI2OReO74nLyATyZTCV64yvOLfGalHfeQdJ2HgW+HovG5yRTiXc9rj9SOo5NpJN9BI/19bFo/CBc8PNDyVRiQbHP5bs9cHn9DC6ouSvfBxmLxsfKMxyDi4N9NJlKvFNgwebiVHeRofmSvE3S18IlfVgLF0Sef+1tgb3kPt4A/p5MJZZ63NNnyVTiqVg0vqeUZakcm60rARQRfLO1s3ECbiWF19B5LC5549utnY1/wkWGvwbMaGvqWihbbI6UB7IFbuXDPtKTjiyjHLNaOxub5PzDKlwfG+AmJ37Y2tmYBC6oYmJUcAlZj6FnQPpBpLPfIxK6tQQhXUo6e6yIwV4BRxqp6337yfe3N97rRwF+0QvxG4mb+c5PcvGGl6UvCUDbpWPO//xmXE6+cqz8rURgbpdzbIjLTp6/6mZZLBo/L5lKXF4gQI+yIqkC8v/n0jPByA3S2XyFL68y6fG5ZJC+g55xlYmc+yQWjZ8rhgIFZfxBMpXI5f+7DzgwZ4fIv7m43IzgskQ34uJTH8sTzT/Q06f7ciwaP7ygE7gBWBKLxp8S4ybH8lg0fmIyleioBQEcVM7BbU1d98iQN+gF2kKskvtwS4sWtHY2Wlw84UyxPu4Q6+DgcsRPLMZjpXKHVbFehuJyBj7S2tlYPX9NJPQSbo2mF1eTzo4u8TxzxQK8qxZeKtLZNXGB6V6+4alEQvf24qzniPi9K0Py/YBX8iy0fH4u4nc/btnm9rgU9d8HTi3noslUojWZSmyRN/mRFvG7Wt71fcQa/Y1YOjmuFPH7pwjJwWJNbdTH2r1KxO85XNjUwSJWf8w75h4p3964LDdnyEjgcrFewS0myIVS/UaE7vAi1/6piN8r8gz2FtfTtsDtkjQhn5CUNYxbIneDaM5v684CzBPBjtbOxtm4vQ36bdKhtbNxtDSq/fuxfvYB7m7tbNy/ikHWZ8vQvzDBxChgMunsQbL+t5gILiCd/a687JfQt6SrQSwvIn5GXnSvLCUWt+a2N4Tl72nJVOJBsUiexc2mF+6rkbM8I7ld5GLR+E9xft4TcDn3euMz20xEYgbwY7Ek34lF45cB14v75qlYNL6WHGeB8clU4n35/bu4rMy99dmtIfWwHDgyb3b2oQLRflEsuhzXxqLxC0R8NwA+TqYSz8Si8Rny/WvJVOKxEoqQiy89OZlKPC1lelrE7esyAnmy8P0uyNY9EdgkFo2vn0wlZtWdAIoI3i9L0q4VH0e1xW976a2KpeLqFitzHv6psobhZvPWwgUNF8u024gL+q5OrxUJTSedvRDvpYXfwi3KP7PEc1mxHP+CWyt9Enkzl33kadyi/GLD8rPxT+F0LZHQM71o+ENZsQnQ1LyGvjAWjb8mDTBHg3Qey4ApudTxecPOvqQMy2URH45L/Z77fP2Cc4fE0nkvJ35S3jdi0bhXjs1S2VrabDYoNEVS3TdLvWwo11snr+y9Ed91pG6XsSJbNslUYnksGv+X3PMuHgL4bN6xi0V0N5MOvz4FUETwPeCw1s7Gg+Wl/1Yfy/KWWA5/LxC/sTjnsVfS0C9kOH0b8HRbU9fHZQrrYBmmfFv8FN/wOfT81s7Ga9qauhZU6TmkcBk1vJK4nkE6+wGR0KVliOpH8rsLZCh4jPTO5bgb5onv52HgASKh4tl909mTgEsDnu85vayf4QXlyqcwlCZ3j8s83pUusd56ywifc+cyzbxecJxXJMJsSt/Zb3Wfe5tXxEp9Eudrf1k6jE9wAc99cRvlyrLIw4f6mU95oWdGGEsN0eeU+G1NXQ8CD7Z2No6ThvYtXHxgseHxx+JL+IeY8FMLZ48lvrDDR/weB05sa+p6tw9lXyYN8y3gD62djUeJT67wQa4tw1Q/68drL95XyhCsZaSzLeLX8aq3S0hnFxMJ/a5M67JbhmbXk84OFl9NSHry9aRBLBJx+AKXKmkGbq3yu0RCpU8WpLMn4nZL82IJMIFIqFdhUslU4rM8y2k0X44SKMxqPEMa2WDgkIId2/pKbq+Yj4pkT8l1xKNj0bjJ7cMhs9hBPsDBeUI2zOO9z11/0/zzFj51Eb87kqnEMXnnO72P9/6JvCMjYtH4eslUIn9bgLEF5ctnKTVMxfYEaWvqegu3m9rlIl7r5TW0wdJrzsNNhrzX1tRVSjbn43GO1kKeBA6o9Prftqauu1o7G88Ri6yQ/f0EcOTEDydVYCj8DulsGOfA9pqcSkhc3Xm9yqDsgq9fkH+VJZ39CcHZgaJEQk/18SpPiqV+KjKLHIvGd2bFpkY5sZwTi8afFGs6Sl46NxGVdZKpRG+3dn1a3CzbxqLxQ5KpxAN5515brj8XN/n3iQw/j2LFfsZhvAO2c5bi3tIZg5uwKXwPsiLwG+N2s7tFrr06sImEuawnx76RV7b98V5COi/PbVCsE1oei8bvFSPnTNwkJrFofBt5LktkpFZXVG1TpLamrtkU3zymGGd4fGZx6eurtYj+jyLihRlVtqn604iE7ied/Slug28vzgG2IZ09UWZ+BxaXveZagvesuJpIqBIbTV2CS8p5gezVO08a3ix6xn3+WEYWl8qeGm+LaOwh4pnqpSW6KBaN/wiXLPSeWDT+kFjNDTLqORh4LJlKLItF45fi0pv9SbJMj8CtqviMnvvq3IkLC/tDLBo/Qfxj35Dh4wZ5118Wi8bPx81E3xyLxk8TC2t73KzzhTIUPxOIxqLxTXCTYYfgZqoL/Z9PSRv7WSwa3w1YN5lKfCOgCn6OC525SDZany3PZDXggmQqMaPeBHBQrRastbNxXbxj1p5ua+qq2m5TbU1dn+X1wgQMtaolglfQM4YrnyOA50ln9xtg8dsR5wwPEr9b8U760BvxeURGBC/gZhzHSUM/H7dUbWHesc+K2Nwmxx2F2xqyi+IrWd6R8831KUcGF3L0iFzjcBmW35Zvdck+uWfh9vdoFFE7UlwShQHZF0unN0uEby3cRNJv5NjFeee9CRc8P1VcGluLZZjbE/svuP2Gu3Gbn28hlufPCs+Fi+RIih+1scD1k5Xj5+Vd+1XpRKbg4hP3Ez/jSclU4lceLqDnPfylr3iUY8AwNSyAjazYIyGf37Q1dZ1T5WtPlR49n/famrrG9qPAXIabXPLD4oJSzyUSmt2P5RoplsBPiowgMsCJMvRWFLUAy8TPWdwfZraXv+Szfr37SOicIgJocHuivE06e54EH1dT+FYjnT1NLIOzi4jfdSp+igpg3/DbJW1BNS/a2tm4Jt5BvO/2ew1EQpfLMCbontcGfg28TzqbIJ39aoWFbwzp7Pm4Xb6uK+IKWAb8iEjohyp+Sj0wpIbL5he+UO29b4/0qZeBSboaCd1JOrsrzp+2QxEh/AnwE9LZf+H2u30AeL6klSQrBM/g/EoHAk24sKZSOsr3gfFEQv/UZqWoAPadt3w+Pxjng6qG9TcM50D24v4Bq4lI6FXS2T1wyRO8UmgVsrv8uxiYTzr7PG6LxXdxMWrzcJMGw3DO+Q2lY9laRHa9Mks4CYhVKL+fovQbtTwJMgw3ze41FD64ranroQpfbzAuvMFrGdfLwPb9uHl6kIW2Ey6X3r418JhewsX4PaJNSalHatYHKGmo/urzdUdrZ+MuFRS/0bgAZL81rBfVhPg5a3AakdB+uKVzLw5QKd7FBSTvpOKnqAVYPStwZ9xiaq9yLsIlKLiyralrVi/Pv5U05P/Df53s3W1NXUfVZAU5f90huFi7g/rheT6FS7N0W1l+RUVRAey1CCZZkbnWi8W4BAqPypDsXdwypFwDHcqKfR7G4tbCbiNDyGIzpi8C+0pwdG2Tzm6KywByJC5YtVLP9kWxxDuIhF7VJqOoAPavAK6Gm4D4dj9f+p/AEbKkr75IZzcQgd8HN6mxFaXNns/EReq/JPf/+IDvKqcoq7IAigiOwKXKau6Hyy3FLey/oB+3++wPURyKCy5fH5deahhuAft83FKoj4iEFmmTUFQAa1cIw7g1k9VYl2tx+9Re1NbU9Yq+GoqiAliLIjgclyoowpc3pukt03ALyCf3JbegoigqgP0thg24PH274YJ4N5dhXuH+GvNxmTY+xqVGegM3u1x2FmlFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRlleb/A7hhlB7cvnMAAAAAAElFTkSuQmCC</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:IPHint>158.64.0.0/16</mdui:IPHint>
diff --git a/swamid-interfederations-2.0/sso.bl.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.bl.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..c4531c53
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.bl.uk-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.bl.uk/idp/shibboleth">
+  <!--
+		This is a Shibboleth IdP for The British Library.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-08T10:16:08Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bl.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">British Library</mdui:DisplayName>
+        <mdui:Logo height="100" width="52">https://www.bl.uk/britishlibrary/resources/global/images/bl_logo_100.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.bl.uk/britishlibrary/resources/global/images/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDEDCCAfigAwIBAgIVALBlb0xD9RVnJc/iRBgGkyuuv6vzMA0GCSqGSIb3DQEB
+						BQUAMBQxEjAQBgNVBAMMCXNzby5ibC51azAeFw0xNTExMjUxNjA4MDZaFw0zNTEx
+						MjUxNjA4MDZaMBQxEjAQBgNVBAMMCXNzby5ibC51azCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBALV1sBlNUZVsWVfQI38jlRlndRGuKVJkbKv0LAXkuCRW
+						1yVfVzC481huMNTDX+3CYb1lkM9IpA3EQnK0PFB79ADvtlQuTAeLZnbHnSuNXtoO
+						Uw3klvdKWjUjB4QC6FI8XS9oYiBwnogW8IH8O40CAAJLgbFuyqeLkFGS4BBk5hKf
+						3Q42eq2So0K4piamfZbMlhdwB1Eovd5YyAN8qISTiDKlEd+BL8ZnB2dvHliSf7BV
+						SP9nxptQ9ncooTErBJhycTQhIB7OlBXPPD9/emJqlVm8njxGHCqufYI6oHSQdg2Z
+						/+4lx2cRrpDKr7ROb/5W9gZBCXYDlUQhHYl2GOa7MRUCAwEAAaNZMFcwHQYDVR0O
+						BBYEFIHLjm+wCv758W1MN5NooNkCbsM3MDYGA1UdEQQvMC2CCXNzby5ibC51a4Yg
+						aHR0cHM6Ly9zc28uYmwudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQAD
+						ggEBAAdklLJrCnZ7a42MWalgiF3Jxch554vKu672us0vIbC4YHOFg3znXGFMQN6s
+						XgfQfwGZvvNvzf2SGvH8p20jjcn/WVKnTNtAUgRT/KQHnAktoASFoLHNY/x+HsWT
+						/wHJw9Sr+eEFPet9lYN9JJu0U8sSC1NKf+kjRcJG7K/6kABscqRVTOJ8fVZzKoz/
+						wUBZw8uhw9U8kad0nyga7JCTMMqX5RvveFIAtnkK77XpJ1vm95VE1Udh03uXUvtN
+						j4nMh5rBX6K6S1rOl7AkRyUW+Nv7ayWjWiU+ASMxnOeo7nfg1xHKLLTf4dUB23ot
+						onq0e4aCSYwqgr4fh8WX2L9+Ncc=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.bl.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bl.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.bl.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.bl.uk/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bl.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.bl.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.bl.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.bl.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.bl.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bl.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDEDCCAfigAwIBAgIVALBlb0xD9RVnJc/iRBgGkyuuv6vzMA0GCSqGSIb3DQEB
+						BQUAMBQxEjAQBgNVBAMMCXNzby5ibC51azAeFw0xNTExMjUxNjA4MDZaFw0zNTEx
+						MjUxNjA4MDZaMBQxEjAQBgNVBAMMCXNzby5ibC51azCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBALV1sBlNUZVsWVfQI38jlRlndRGuKVJkbKv0LAXkuCRW
+						1yVfVzC481huMNTDX+3CYb1lkM9IpA3EQnK0PFB79ADvtlQuTAeLZnbHnSuNXtoO
+						Uw3klvdKWjUjB4QC6FI8XS9oYiBwnogW8IH8O40CAAJLgbFuyqeLkFGS4BBk5hKf
+						3Q42eq2So0K4piamfZbMlhdwB1Eovd5YyAN8qISTiDKlEd+BL8ZnB2dvHliSf7BV
+						SP9nxptQ9ncooTErBJhycTQhIB7OlBXPPD9/emJqlVm8njxGHCqufYI6oHSQdg2Z
+						/+4lx2cRrpDKr7ROb/5W9gZBCXYDlUQhHYl2GOa7MRUCAwEAAaNZMFcwHQYDVR0O
+						BBYEFIHLjm+wCv758W1MN5NooNkCbsM3MDYGA1UdEQQvMC2CCXNzby5ibC51a4Yg
+						aHR0cHM6Ly9zc28uYmwudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQAD
+						ggEBAAdklLJrCnZ7a42MWalgiF3Jxch554vKu672us0vIbC4YHOFg3znXGFMQN6s
+						XgfQfwGZvvNvzf2SGvH8p20jjcn/WVKnTNtAUgRT/KQHnAktoASFoLHNY/x+HsWT
+						/wHJw9Sr+eEFPet9lYN9JJu0U8sSC1NKf+kjRcJG7K/6kABscqRVTOJ8fVZzKoz/
+						wUBZw8uhw9U8kad0nyga7JCTMMqX5RvveFIAtnkK77XpJ1vm95VE1Udh03uXUvtN
+						j4nMh5rBX6K6S1rOl7AkRyUW+Nv7ayWjWiU+ASMxnOeo7nfg1xHKLLTf4dUB23ot
+						onq0e4aCSYwqgr4fh8WX2L9+Ncc=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.bl.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bl.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">The British Library</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">British Library</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.bl.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Janice</GivenName>
+    <SurName>Mulholand</SurName>
+    <EmailAddress>mailto:janice.mulholland@bl.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Guy</GivenName>
+    <SurName>Wicks</SurName>
+    <EmailAddress>mailto:Guy.Wicks@bl.uk</EmailAddress>
+  </ContactPerson>
+</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
deleted file mode 100644
index 6de7f9ac..00000000
--- a/swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?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.fh-salzburg.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.fh-salzburg.ac.at-idp-shibboleth.xml
new file mode 100644
index 00000000..4b6832ed
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.fh-salzburg.ac.at-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://sso.fh-salzburg.ac.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-07-15T16:30:10Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-salzburg.ac.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Fachhochschule Salzburg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Salzburg University of Applied Sciences</mdui:DisplayName>
+        <mdui:Logo width="80" height="60">https://sso.fh-salzburg.ac.at/images/fhs_logo_80_60.png</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://sso.fh-salzburg.ac.at/images/fhs_logo_16_16.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDPzCCAiegAwIBAgIUeFyQRjNS1xdQA/IhbscIB+iGNc0wDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVc3NvLmZoLXNhbHpidXJnLmFjLmF0MB4XDTA5MDcwOTEz
+NDk0N1oXDTI5MDcwOTEzNDk0N1owIDEeMBwGA1UEAxMVc3NvLmZoLXNhbHpidXJn
+LmFjLmF0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuxeLIPUQcEUg
+38IFt3Gj3B9An6+kLFkoEAfM6LDgkjW/dL//P/e73DWuNpBUA86hqhUmW9hYBwbm
+xp/Wc9dWusIYQtAjUdtLXhitY+eylNjnx3onqMn2r8S9Go9j5IeQYBq6EBTYObq2
+9SBYn35PBq3qugyTua9UgvQwBJg6gcWJD6Kajvha59H2EGn6ayPH0+y09vTzKX2d
+Wq217+AgW4mcve5nmmpXfSaBJTgKARSC1hvKdD6F4aAA1POyGnxOUwp59sxS1/St
+7kLWn2nzBNTB+LM7LgHl+Hh9UmO7jHByU+n3TvAIcln4MdlFg2yP9WrnsmqzVKQV
+D9lElEbnhwIDAQABo3EwbzBOBgNVHREERzBFghVzc28uZmgtc2FsemJ1cmcuYWMu
+YXSGLGh0dHBzOi8vc3NvLmZoLXNhbHpidXJnLmFjLmF0L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRXF8WMjO3oWLjWjDoEQflppkFdsDANBgkqhkiG9w0BAQUFAAOC
+AQEAKRJ6BIo1ncQCtJMGBIEyqqM36wds49G6Xw/awi3wOUasPc7gyYQhb5IyOktt
+ktuDWZIWYiqjPPtTvwkYjCN220qaX2ihH8LkMadmRasaQQA92LNnya4c9vCjGkWq
+egJ9WMSbV3alBpo94ljPNl1Hl62Zr5rG/S03NvQj9s6P7o/B8Kbz72kKjRmY37BV
+AIxGRgnuyptAjR8b52K+b6ulQ7fmNZghE8/DgOWz+XiIed7Q6fNp+frTsHD2sP/t
+3AGZtUbc+1qY/MVys1XAryOD6xUrg3oNDgobviNeAaAyckNI/lYs7SqVkxGKmRB0
+nrHqzrR12bmzu2xBInQmirFzcg==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.fh-salzburg.ac.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.fh-salzburg.ac.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.fh-salzburg.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.fh-salzburg.ac.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Fachhochschule Salzburg GmbH</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Salzburg University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Fachhochschule Salzburg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Salzburg University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.fh-salzburg.ac.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fh-salzburg.ac.at/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO</md:GivenName>
+    <md:SurName>Admins</md:SurName>
+    <md:EmailAddress>mailto:ssomaster@fh-salzburg.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.sandburg.edu-adfs-services-trust.xml b/swamid-interfederations-2.0/sso.sandburg.edu-adfs-services-trust.xml
index 37d82b43..698ed1e6 100644
--- a/swamid-interfederations-2.0/sso.sandburg.edu-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sso.sandburg.edu-adfs-services-trust.xml
@@ -89,7 +89,7 @@ Pm/hEI8PBxwYY7bgY1iVzQ==
     <md:EmailAddress>rstevens@sandburg.edu</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
-    <md:GivenName>Christy Pecsi</md:GivenName>
-    <md:EmailAddress>cpecsi@sandburg.edu</md:EmailAddress>
+    <md:GivenName>Linda Lee</md:GivenName>
+    <md:EmailAddress>llee@sandburg.edu</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml
index 64351a88..865c3ec0 100644
--- a/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml
@@ -11,8 +11,8 @@
       <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 height="77" width="200">https://bigmail.tugraz.at/source/images/logo_head.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://bigmail.tugraz.at/favicon.ico</mdui:Logo>
+        <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">
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 99a527cd..97724e30 100644
--- a/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
+++ b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
@@ -15,8 +15,8 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utu.fi</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml
index 8dd0927d..4afa2a2e 100644
--- a/swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml
@@ -15,9 +15,9 @@
         <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 height="256" width="256">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
-        <mdui:Logo height="88" width="80">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
-        <mdui:Logo height="16" width="16">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
+        <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>
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 cad53fbd..82b85619 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,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://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" registrationInstant="2013-11-29T11:29:26Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2013-11-29T11:29:26Z" 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 AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:Description xml:lang="da">Formålet er at give ansatte fra WAYF-tilsluttede institutioner personlig adgang til samarbejdssites oprettet af DTU-ansatte.</mdui:Description>
@@ -23,9 +23,9 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.ait.dtu.dk/adfs/ls/"/>
     <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://sts.ait.dtu.dk/adfs/ls/" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sts.ait.dtu.dk/adfs/ls/" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.ait.dtu.dk/adfs/ls/" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" Location="https://sts.ait.dtu.dk/adfs/ls/"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" index="1" Location="https://sts.ait.dtu.dk/adfs/ls/"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" index="2" Location="https://sts.ait.dtu.dk/adfs/ls/"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">Share DTU</md:ServiceName>
       <md:ServiceName xml:lang="en">Share DTU</md:ServiceName>
@@ -48,8 +48,6 @@
     <md:OrganizationURL xml:lang="en">http://www.dtu.dk/english</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:EmailAddress>tato@dtu.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.tue.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.tue.nl-adfs-services-trust.xml
index 45694fe5..ffb5f40a 100644
--- a/swamid-interfederations-2.0/sts.tue.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.tue.nl-adfs-services-trust.xml
@@ -8,8 +8,10 @@
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="nl">Technische Universiteit Eindhoven (new)</mdui:Description>
-        <mdui:Description xml:lang="en">Eindhoven University of Technology (new)</mdui:Description>
+        <mdui:DisplayName xml:lang="nl">Technische Universiteit Eindhoven</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Eindhoven University of Technology</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Technische Universiteit Eindhoven</mdui:Description>
+        <mdui:Description xml:lang="en">Eindhoven University of Technology</mdui:Description>
         <mdui:Logo height="160" width="200">https://static.surfconext.nl/logos/idp/tue.png</mdui:Logo>
         <mdui:Keywords xml:lang="en">Eindhoven University of Technology</mdui:Keywords>
         <mdui:Keywords xml:lang="nl">Technische Universiteit Eindhoven</mdui:Keywords>
@@ -26,6 +28,14 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/81e25d2c888ac3f473762b387192f452"/>
   </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Technische Universiteit Eindhoven</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Eindhoven University of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">Technische Universiteit Eindhoven</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Eindhoven University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">https://www.tue.nl/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.tue.nl/en/</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>SURFconext support</md:GivenName>
     <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
diff --git a/swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml b/swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml
new file mode 100644
index 00000000..060731c3
--- /dev/null
+++ b/swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sts.windows.net/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-20T10:07:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montpellier-bs.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Montpellier Business School</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABQklEQVQoz+2NS07CYBhF7/+opUBboISHAiZKQlyAiQtw7shVuAQX4TZ0D04cuQITElAMUB+8SmnLo6X9nOjQBOee4ck9uUw7v85qqTjacinmC3+7WgFMSe9dXV4UTTOO45gQJ+AMCUFwyNNmIaXI4cQXnNUK+Wbl0J563c/IMvQwisKYWRnsm/TusrKejH0m61ZG2xMlQw2CTbmYPakVnvpj4nHLipxgM/HIEOgOI0tXVkvSJROonx1XjJc39+gg1xk6r2Pv9r7dapQaluoH/nTu9T4W1ZxoD2Z6Ch3bleW8OXCTIJG9SWiP19VKvl7OZdLq47MDAMDICWbLJTGxsZP+aMFu7h70tOqvNkRQpFAVORg5pbwuOOccAFuuQyJoqgRYGG0ZEQEggGEnZJIQGECgH0Ug9nv+/bA7/E/r/2BHvgBoo5Hqom3djQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMCswMjowMFq3xdUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzArMDI6MDAr6n1pAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.montpellier-bs.com/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Montpellier Business School - IDP - Production</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Montpellier Business School</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Montpellier Business School - IDP - Production</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIC4jCCAcqgAwIBAgIQQNXrmzhLN4VGlUXDYCRT3zANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJhY2NvdW50cy5hY2Nlc3Njb250cm9sLndpbmRvd3MubmV0MB4XDTE0MTAyODAwMDAwMFoXDTE2MTAyNzAwMDAwMFowLTErMCkGA1UEAxMiYWNjb3VudHMuYWNjZXNzY29udHJvbC53aW5kb3dzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyKs/uPhEf7zVizjfcr/ISGFe9+yUOqwpel38zgutvLHmFD39E2hpPdQhcXn4c4dt1fU5KvkbcDdVbP8+e4TvNpJMy/nEB2V92zCQ/hhBjilwhF1ETe1TMmVjALs0KFvbxW9ZN3EdUVvxFvz/gvG29nQhl4QWKj3x8opr89lmq14Z7T0mzOV8kub+cgsOU/1bsKqrIqN1fMKKFhjKaetctdjYTfGzVQ0AJAzzbtg0/Q1wdYNAnhSDafygEv6kNiquk0r0RyasUUevEXs2LY3vSgKsKseI8ZZlQEMtE9/k/iAG7JNcEbVg53YTurNTrPnXJOU88mf3TToX14HpYsS1ECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAfolx45w0i8CdAUjjeAaYdhG9+NDHxop0UvNOqlGqYJexqPLuvX8iyUaYxNGzZxFgGI3GpKfmQP2JQWQ1E5JtY/n8iNLOKRMwqkuxSCKJxZJq4Sl/m/Yv7TS1P5LNgAj8QLCypxsWrTAmq2HSpkeSk4JBtsYxX6uhbGM/K1sEktKybVTHu22/7TmRqWTmOUy9wQvMjJb2IXdMGLG3hVntN/WWcs5w8vbt1i8Kk6o19W2MjZ95JaECKjBDYRlhG1KmSBtrsKsCBQoBzwH/rXfksTO9JoUYLXiW0IppB7DhNH4PJ5hZI91R8rR0H3/bKkLSuDaKLWSqMhozdhXsIIKvJQ==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Montpellier Business School</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Montpellier Business School</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.montpellier-bs.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>admin.infra.dsi@montpellier-bs.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml
index 8481e970..486ae339 100644
--- a/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml
@@ -21,8 +21,8 @@
         <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:Logo xml:lang="sv" height="122" width="350">https://swamid2.shh.se/idp/images/shh_logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="122" width="350">https://swamid2.shh.se/idp/images/shh_logo.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">shh sophiahemmet+högskola sophiahemmet+university</mdui:Keywords>
         <mdui:Keywords xml:lang="en">shh sophiahemmet+högskola sophiahemmet+university</mdui:Keywords>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/talkbank.talkbank.org-shibboleth.xml b/swamid-interfederations-2.0/talkbank.talkbank.org-shibboleth.xml
index 468621f2..2b67966f 100644
--- a/swamid-interfederations-2.0/talkbank.talkbank.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/talkbank.talkbank.org-shibboleth.xml
@@ -7,7 +7,7 @@
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc: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/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml b/swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml
index f80c9ff8..b3aaf6da 100644
--- a/swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="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:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd" entityID="http://test-adfs.geant.net/adfs/services/trust">
   <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
@@ -53,15 +53,15 @@ OVRy4URr0xxsk41aMJbyW8G9g8TmHMUwY+SwfvYXziQ4Jf67MMMf4a8c2ywZJXTz
     <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:RequestedAttribute FriendlyName="email" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="surname" isRequired="true" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" isRequired="true" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" isRequired="true" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="commonName" isRequired="true" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml b/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml
index 01c1e886..aea1c055 100644
--- a/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-sp.aco.net/shibboleth">
+<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"/>
@@ -24,7 +24,7 @@
         <mdui:Description xml:lang="de">Ein SAML2 Service Provider, der allen eduID.at Teilnehmern zur Demonstration und für Tests zur Verfügung steht.</mdui:Description>
         <mdui:Description xml:lang="en">A demo Service Provider for the SAML2-based eduID.at Federation. Open to all eduID.at member institutions.</mdui:Description>
         <mdui:InformationURL xml:lang="en">https://wiki.univie.ac.at/display/federation/SAML+Demo+SP</mdui:InformationURL>
-        <mdui:Logo height="94" width="195">https://www.aco.net/fileadmin/aconet/Logos/aconetlogo.gif</mdui:Logo>
+        <mdui:Logo width="195" height="94">https://www.aco.net/fileadmin/aconet/Logos/aconetlogo.gif</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..a1579bbe
--- /dev/null
+++ b/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.abertay.unidesk.ac.uk/tas/public/login/verify">
+  <!--
+		This is a "Test Unidesk - Abertay" TOPdesk SP for University of Edinburgh.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:27:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID7TCCAtWgAwIBAgIJAPUeIQj7lZ7QMA0GCSqGSIb3DQEBCwUAMFcxIzAhBgNV
+						BAMTGnRlc3QuYWJlcnRheS51bmlkZXNrLmFjLnVrMSMwIQYDVQQKExp0ZXN0LmFi
+						ZXJ0YXkudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNTI0
+						WhcNMjYwMzMwMTIzNTI0WjBXMSMwIQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVz
+						ay5hYy51azEjMCEGA1UEChMadGVzdC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJ
+						BgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0jHonD5R
+						ppuiFhtJsgXq/4z/rPdkJItKFdE9PlTjTHHBtpPolHTgVRRspCneX6CTdFVtGG8z
+						25gdnmfs2ykUxyk1nzSzFJLV4tBKM1mOgYeZXYrcAXrppfkZARFybooj3zZn6XNi
+						77vPuWiKWQBUAMAeTNxt1+CGWQXYA0c/quHwIyiWnAyzKM8FiN5JOQrJ4cFszE3U
+						uhGannOO0RDv5bI2YWxEAx7IYFSGVm68Kwl/C6lQ1fcUoTqsGS/3YQEQGDdCG9cU
+						4yALCA5f7Mj/PmFtnK3e0Y6MCVnNtWH/7958eMAVv4RgrqmQuPRbiCox+HeaK1aK
+						iiWq9DuF3QS4BQIDAQABo4G7MIG4MB0GA1UdDgQWBBT7z4eRV9C/3pmldtooNQTp
+						yu2oVzCBiAYDVR0jBIGAMH6AFPvPh5FX0L/emaV22ig1BOnK7ahXoVukWTBXMSMw
+						IQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVzay5hYy51azEjMCEGA1UEChMadGVz
+						dC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLggkA9R4hCPuVntAw
+						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVqr3p35sr70RxxlCdqKl
+						1/qZJHd5G+I4TUJBXLZVXS9z8yXZoGQeHiRkrIm2++sVen2iBXG87CKfHvuFfqH2
+						DtxuSSxw0EOPAzY9uYBMkzbtuos4LxflATngm5B943+++DYQoLTbs98sWLhFjgOC
+						cNXXa//18LXVQ/Y21QuRQctu4UbdGrP5qWtKsjCmmv/XVH8/J52tf0xf/uygp0Ip
+						kPOD+P7yHonb3slyoqg2k45mvpCFVkKreWvd20Hi4kqPhEKFYs4X6QCsMRlH7KMN
+						1mSmbpr5sfg/lzDP6EYvvDdUPL4Nu5rkd3wYN+3s82k8xYFDgG+fKO2x9EUwmtQ7
+						JA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID7TCCAtWgAwIBAgIJAPUeIQj7lZ7QMA0GCSqGSIb3DQEBCwUAMFcxIzAhBgNV
+						BAMTGnRlc3QuYWJlcnRheS51bmlkZXNrLmFjLnVrMSMwIQYDVQQKExp0ZXN0LmFi
+						ZXJ0YXkudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNTI0
+						WhcNMjYwMzMwMTIzNTI0WjBXMSMwIQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVz
+						ay5hYy51azEjMCEGA1UEChMadGVzdC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJ
+						BgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0jHonD5R
+						ppuiFhtJsgXq/4z/rPdkJItKFdE9PlTjTHHBtpPolHTgVRRspCneX6CTdFVtGG8z
+						25gdnmfs2ykUxyk1nzSzFJLV4tBKM1mOgYeZXYrcAXrppfkZARFybooj3zZn6XNi
+						77vPuWiKWQBUAMAeTNxt1+CGWQXYA0c/quHwIyiWnAyzKM8FiN5JOQrJ4cFszE3U
+						uhGannOO0RDv5bI2YWxEAx7IYFSGVm68Kwl/C6lQ1fcUoTqsGS/3YQEQGDdCG9cU
+						4yALCA5f7Mj/PmFtnK3e0Y6MCVnNtWH/7958eMAVv4RgrqmQuPRbiCox+HeaK1aK
+						iiWq9DuF3QS4BQIDAQABo4G7MIG4MB0GA1UdDgQWBBT7z4eRV9C/3pmldtooNQTp
+						yu2oVzCBiAYDVR0jBIGAMH6AFPvPh5FX0L/emaV22ig1BOnK7ahXoVukWTBXMSMw
+						IQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVzay5hYy51azEjMCEGA1UEChMadGVz
+						dC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLggkA9R4hCPuVntAw
+						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVqr3p35sr70RxxlCdqKl
+						1/qZJHd5G+I4TUJBXLZVXS9z8yXZoGQeHiRkrIm2++sVen2iBXG87CKfHvuFfqH2
+						DtxuSSxw0EOPAzY9uYBMkzbtuos4LxflATngm5B943+++DYQoLTbs98sWLhFjgOC
+						cNXXa//18LXVQ/Y21QuRQctu4UbdGrP5qWtKsjCmmv/XVH8/J52tf0xf/uygp0Ip
+						kPOD+P7yHonb3slyoqg2k45mvpCFVkKreWvd20Hi4kqPhEKFYs4X6QCsMRlH7KMN
+						1mSmbpr5sfg/lzDP6EYvvDdUPL4Nu5rkd3wYN+3s82k8xYFDgG+fKO2x9EUwmtQ7
+						JA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.abertay.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Test Unidesk - Abertay</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IS Apps Technology Management</GivenName>
+    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..bbf0e4b3
--- /dev/null
+++ b/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.abertay.unidesk.ac.uk/tas/secure/login/verify">
+  <!--
+		This is a "Test Unidesk - Abertay" TOPdesk SP for University of Edinburgh.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:27:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID7TCCAtWgAwIBAgIJAKb90q3jCoX6MA0GCSqGSIb3DQEBCwUAMFcxIzAhBgNV
+						BAMTGnRlc3QuYWJlcnRheS51bmlkZXNrLmFjLnVrMSMwIQYDVQQKExp0ZXN0LmFi
+						ZXJ0YXkudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNTI2
+						WhcNMjYwMzMwMTIzNTI2WjBXMSMwIQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVz
+						ay5hYy51azEjMCEGA1UEChMadGVzdC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJ
+						BgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx/g97614
+						+AFKYGTwsyWijqMFEU0kqLrP/UsTpCDeJh8quiaBTr38UrLBrovxlItPpkqbIaxP
+						lhTxwZHDg13MPqiRNdIKT9woaegI7fwjgKkd497b7nlqvYPkSaVqguz6f5SCBMUn
+						YKgyFmCpBq9NEO8vCPOM4rpcYRIkvUeR5MT3pTe3GJvbwiomIlkK/E+ad8h153UD
+						qnF+bmmtriP4s5mxDF/2uVP+Rvf43NU7XnNUyWXHusyAH9ENHp6j42kkqGN3uRdE
+						6R0Sc0vVvlMT1OIfaJBDa1aoFo/oDyX0nh+346GoShCg01iygTz5C1GC8TPzK7Oo
+						FAS3BIQWTLWyqQIDAQABo4G7MIG4MB0GA1UdDgQWBBRXr6CxoOyUDhr0A2Zc91Ee
+						HLXkvjCBiAYDVR0jBIGAMH6AFFevoLGg7JQOGvQDZlz3UR4cteS+oVukWTBXMSMw
+						IQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVzay5hYy51azEjMCEGA1UEChMadGVz
+						dC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLggkApv3SreMKhfow
+						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAlHFolMwX31uyP+qbQFoC
+						55phkzHYo5JF6Zamk+v7sqi4mP9JkkbJGhKGz6rNxf2/COFgryc0V+iV0vfggrzO
+						rOqWOg/hXGVwqF2kLHs520Uk0ZH3U0K1+NvJZHsyqslkgjIQkpzLn7kfVGYp1i6I
+						w7Nr6ST2g6ilGlB2D8Jk4JCIxIwuU6cV5XV3Fy4OuWck0oPfOK3zDCCcxSW8wOmw
+						/rBBSrt3FfAHM+4WO/YZVIpnKMQikmHRc4wxW8obHYu+Ut4DXWoPoqNBumdBVv/g
+						sSw+9Fu2Zto/cMH17ZPL6F/LSnVBWRhfNuGP9+JhGbRqFUtn5AedGAdzwyc9ngfn
+						dQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID7TCCAtWgAwIBAgIJAKb90q3jCoX6MA0GCSqGSIb3DQEBCwUAMFcxIzAhBgNV
+						BAMTGnRlc3QuYWJlcnRheS51bmlkZXNrLmFjLnVrMSMwIQYDVQQKExp0ZXN0LmFi
+						ZXJ0YXkudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNTI2
+						WhcNMjYwMzMwMTIzNTI2WjBXMSMwIQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVz
+						ay5hYy51azEjMCEGA1UEChMadGVzdC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJ
+						BgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx/g97614
+						+AFKYGTwsyWijqMFEU0kqLrP/UsTpCDeJh8quiaBTr38UrLBrovxlItPpkqbIaxP
+						lhTxwZHDg13MPqiRNdIKT9woaegI7fwjgKkd497b7nlqvYPkSaVqguz6f5SCBMUn
+						YKgyFmCpBq9NEO8vCPOM4rpcYRIkvUeR5MT3pTe3GJvbwiomIlkK/E+ad8h153UD
+						qnF+bmmtriP4s5mxDF/2uVP+Rvf43NU7XnNUyWXHusyAH9ENHp6j42kkqGN3uRdE
+						6R0Sc0vVvlMT1OIfaJBDa1aoFo/oDyX0nh+346GoShCg01iygTz5C1GC8TPzK7Oo
+						FAS3BIQWTLWyqQIDAQABo4G7MIG4MB0GA1UdDgQWBBRXr6CxoOyUDhr0A2Zc91Ee
+						HLXkvjCBiAYDVR0jBIGAMH6AFFevoLGg7JQOGvQDZlz3UR4cteS+oVukWTBXMSMw
+						IQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVzay5hYy51azEjMCEGA1UEChMadGVz
+						dC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLggkApv3SreMKhfow
+						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAlHFolMwX31uyP+qbQFoC
+						55phkzHYo5JF6Zamk+v7sqi4mP9JkkbJGhKGz6rNxf2/COFgryc0V+iV0vfggrzO
+						rOqWOg/hXGVwqF2kLHs520Uk0ZH3U0K1+NvJZHsyqslkgjIQkpzLn7kfVGYp1i6I
+						w7Nr6ST2g6ilGlB2D8Jk4JCIxIwuU6cV5XV3Fy4OuWck0oPfOK3zDCCcxSW8wOmw
+						/rBBSrt3FfAHM+4WO/YZVIpnKMQikmHRc4wxW8obHYu+Ut4DXWoPoqNBumdBVv/g
+						sSw+9Fu2Zto/cMH17ZPL6F/LSnVBWRhfNuGP9+JhGbRqFUtn5AedGAdzwyc9ngfn
+						dQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.abertay.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Test Unidesk - Abertay</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IS Apps Technology Management</GivenName>
+    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ed.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.ed.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..b61050a4
--- /dev/null
+++ b/swamid-interfederations-2.0/test.ed.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ed.unidesk.ac.uk/tas/public/login/verify">
+  <!--
+		This is a "public" TOPdesk SP for University of Edinburgh. 
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-21T10:27:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID+jCCAuKgAwIBAgIJAOe5qJxhhbowMA0GCSqGSIb3DQEBCwUAMFsxJTAjBgNV
+						BAMTHHd3dy10ZXN0LnRvcGRlc2suaXMuZWQuYWMudWsxJTAjBgNVBAoTHHd3dy10
+						ZXN0LnRvcGRlc2suaXMuZWQuYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDMwMTE1
+						NDYzOFoXDTI2MDIyNzE1NDYzOFowWzElMCMGA1UEAxMcd3d3LXRlc3QudG9wZGVz
+						ay5pcy5lZC5hYy51azElMCMGA1UEChMcd3d3LXRlc3QudG9wZGVzay5pcy5lZC5h
+						Yy51azELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC8o6FAxyTWYU3kFOIDnq1eybLOfW3p6paPJBMo/PP+Emt+PC/qPNQtWL3I3oFU
+						KZhL80lQESBGIbkaENsK9ETojjTkn1BRoS7wqtNWmXF2hOQ7bf6twDvW3FIQeHdZ
+						QU7WUXgE21G/WA1c4sjfBsK3MBoSZE/sRxZ/95XBW++yeFbmfgY1rL81lvhfJY/0
+						0FDGfEC8mQ4YVeOWVy/3x2AF3VUm//4/mmiun8C5jLMCzPW5lWxZMOtg3YRhjRS2
+						TMc3blfFQAWPmOha0fNICa8xSAziurteP+losqmybTtGYcPG4SC0kosK9x6dnN7u
+						hgONsfGABr13NX/IKUoDBKP/AgMBAAGjgcAwgb0wHQYDVR0OBBYEFAkmOmHKav/Y
+						K7QuAz223XNqpP5LMIGNBgNVHSMEgYUwgYKAFAkmOmHKav/YK7QuAz223XNqpP5L
+						oV+kXTBbMSUwIwYDVQQDExx3d3ctdGVzdC50b3BkZXNrLmlzLmVkLmFjLnVrMSUw
+						IwYDVQQKExx3d3ctdGVzdC50b3BkZXNrLmlzLmVkLmFjLnVrMQswCQYDVQQGEwJV
+						S4IJAOe5qJxhhbowMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAIVI
+						fxVxakrwPy9MHsmpty4sYLbSaUL68hsOm3Zj5dQnKBdy3P5CTV4ahNigzBglbnHW
+						qE4y8KoBpqb/7WAm8Tp5Req4s06cmgbr3aAzmTEGrgzo2jABdGekoePhvW/pH/wv
+						FwTwzmpm5L42LceS3llNVKmZk3qC/SSyvnWm3KcaeoKq5S9w432+cI1uKwmqzELP
+						HgFafFvb4gFVQf1mdkt1r6Q/osZM0Az5P4eHZB6zcVujrD77fepA8vYCcmJvngxV
+						Q2wXXa6AzUug0DyHafhMIMoVvIwf9al4NNakqEGgedooKyW74DfNMWHjbeOvCsed
+						fsrpdzF912sN2tXYWAg=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID+jCCAuKgAwIBAgIJAOe5qJxhhbowMA0GCSqGSIb3DQEBCwUAMFsxJTAjBgNV
+						BAMTHHd3dy10ZXN0LnRvcGRlc2suaXMuZWQuYWMudWsxJTAjBgNVBAoTHHd3dy10
+						ZXN0LnRvcGRlc2suaXMuZWQuYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDMwMTE1
+						NDYzOFoXDTI2MDIyNzE1NDYzOFowWzElMCMGA1UEAxMcd3d3LXRlc3QudG9wZGVz
+						ay5pcy5lZC5hYy51azElMCMGA1UEChMcd3d3LXRlc3QudG9wZGVzay5pcy5lZC5h
+						Yy51azELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC8o6FAxyTWYU3kFOIDnq1eybLOfW3p6paPJBMo/PP+Emt+PC/qPNQtWL3I3oFU
+						KZhL80lQESBGIbkaENsK9ETojjTkn1BRoS7wqtNWmXF2hOQ7bf6twDvW3FIQeHdZ
+						QU7WUXgE21G/WA1c4sjfBsK3MBoSZE/sRxZ/95XBW++yeFbmfgY1rL81lvhfJY/0
+						0FDGfEC8mQ4YVeOWVy/3x2AF3VUm//4/mmiun8C5jLMCzPW5lWxZMOtg3YRhjRS2
+						TMc3blfFQAWPmOha0fNICa8xSAziurteP+losqmybTtGYcPG4SC0kosK9x6dnN7u
+						hgONsfGABr13NX/IKUoDBKP/AgMBAAGjgcAwgb0wHQYDVR0OBBYEFAkmOmHKav/Y
+						K7QuAz223XNqpP5LMIGNBgNVHSMEgYUwgYKAFAkmOmHKav/YK7QuAz223XNqpP5L
+						oV+kXTBbMSUwIwYDVQQDExx3d3ctdGVzdC50b3BkZXNrLmlzLmVkLmFjLnVrMSUw
+						IwYDVQQKExx3d3ctdGVzdC50b3BkZXNrLmlzLmVkLmFjLnVrMQswCQYDVQQGEwJV
+						S4IJAOe5qJxhhbowMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAIVI
+						fxVxakrwPy9MHsmpty4sYLbSaUL68hsOm3Zj5dQnKBdy3P5CTV4ahNigzBglbnHW
+						qE4y8KoBpqb/7WAm8Tp5Req4s06cmgbr3aAzmTEGrgzo2jABdGekoePhvW/pH/wv
+						FwTwzmpm5L42LceS3llNVKmZk3qC/SSyvnWm3KcaeoKq5S9w432+cI1uKwmqzELP
+						HgFafFvb4gFVQf1mdkt1r6Q/osZM0Az5P4eHZB6zcVujrD77fepA8vYCcmJvngxV
+						Q2wXXa6AzUug0DyHafhMIMoVvIwf9al4NNakqEGgedooKyW74DfNMWHjbeOvCsed
+						fsrpdzF912sN2tXYWAg=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ed.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Unidesk - University of Edinburgh (test)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IS Apps Technology Management</GivenName>
+    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ed.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.ed.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..31cdc817
--- /dev/null
+++ b/swamid-interfederations-2.0/test.ed.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ed.unidesk.ac.uk/tas/secure/login/verify">
+  <!--
+		This is a "secure" TOPdesk SP for University of Edinburgh.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-21T10:28:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID+jCCAuKgAwIBAgIJAOq3nFRbS3rJMA0GCSqGSIb3DQEBCwUAMFsxJTAjBgNV
+						BAMTHHd3dy10ZXN0LnRvcGRlc2suaXMuZWQuYWMudWsxJTAjBgNVBAoTHHd3dy10
+						ZXN0LnRvcGRlc2suaXMuZWQuYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDMwMTE1
+						NDY0MFoXDTI2MDIyNzE1NDY0MFowWzElMCMGA1UEAxMcd3d3LXRlc3QudG9wZGVz
+						ay5pcy5lZC5hYy51azElMCMGA1UEChMcd3d3LXRlc3QudG9wZGVzay5pcy5lZC5h
+						Yy51azELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDIOrMR7GGcD8KjTNJZqFpOdiGtdjoxjtcsIhwTTDUBMJuNdoSHGase+e7P015q
+						8NvkI6DXywid+qGbpFmwUl09scCvhRyAXvzk6Iqyg0TcP/fvud507/HK0zX3xgfv
+						jH5Nh70znAP264wrdWDUviuyu+zA7ySDuyCKD6npfVtKCalgfDAw3AcLoxj3/eKJ
+						wIABvbcVOd8TF64uGAPNXxv9K/GUsp2jYBWgE1dTtkEpTyThLQoytBrC+vqbxsRK
+						NiU7JpxyMNsF6KIHNjmK5wjiSP8hRiVLrEAV2yLqCByv16rWAUKmXsvyoEGCgZSM
+						kNjPlarGpjz6WRb2VuhG/rtXAgMBAAGjgcAwgb0wHQYDVR0OBBYEFDBi3LtzvdE+
+						AESqUKH8Dhkqn/LpMIGNBgNVHSMEgYUwgYKAFDBi3LtzvdE+AESqUKH8Dhkqn/Lp
+						oV+kXTBbMSUwIwYDVQQDExx3d3ctdGVzdC50b3BkZXNrLmlzLmVkLmFjLnVrMSUw
+						IwYDVQQKExx3d3ctdGVzdC50b3BkZXNrLmlzLmVkLmFjLnVrMQswCQYDVQQGEwJV
+						S4IJAOq3nFRbS3rJMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAAny
+						YIXTvm5eG+kSZSMBbkHoB56dz/ijfNvecp7Lx4UYMfqLij/uHDB3Hc5qLw1RcGvh
+						Awae8S11SbhWegJmMRjLfDHlhb/Ah1l7ouu2HWYW4LKqdy35BI3Yc/jcyNJ/zTP/
+						Iukm2hWuTVc3wlgz0VcWuX/ns/nfpoRWYIJne2opY7Di22zJdPZzdLOeRiZv2Jw9
+						fgYEIS5LBJ7vSo9W8oEqr8miskPEqT5wXca6osDp0MTx3pyfH3Uu/497gtsBSX9q
+						rCmsI2MfzzLnlrx3VpzkwP++KDC4bvf8/TAOw/LziEv19ezSBN+34bMvuh9FdNLk
+						dFAT0uiujIjT3M6S340=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID+jCCAuKgAwIBAgIJAOq3nFRbS3rJMA0GCSqGSIb3DQEBCwUAMFsxJTAjBgNV
+						BAMTHHd3dy10ZXN0LnRvcGRlc2suaXMuZWQuYWMudWsxJTAjBgNVBAoTHHd3dy10
+						ZXN0LnRvcGRlc2suaXMuZWQuYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDMwMTE1
+						NDY0MFoXDTI2MDIyNzE1NDY0MFowWzElMCMGA1UEAxMcd3d3LXRlc3QudG9wZGVz
+						ay5pcy5lZC5hYy51azElMCMGA1UEChMcd3d3LXRlc3QudG9wZGVzay5pcy5lZC5h
+						Yy51azELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDIOrMR7GGcD8KjTNJZqFpOdiGtdjoxjtcsIhwTTDUBMJuNdoSHGase+e7P015q
+						8NvkI6DXywid+qGbpFmwUl09scCvhRyAXvzk6Iqyg0TcP/fvud507/HK0zX3xgfv
+						jH5Nh70znAP264wrdWDUviuyu+zA7ySDuyCKD6npfVtKCalgfDAw3AcLoxj3/eKJ
+						wIABvbcVOd8TF64uGAPNXxv9K/GUsp2jYBWgE1dTtkEpTyThLQoytBrC+vqbxsRK
+						NiU7JpxyMNsF6KIHNjmK5wjiSP8hRiVLrEAV2yLqCByv16rWAUKmXsvyoEGCgZSM
+						kNjPlarGpjz6WRb2VuhG/rtXAgMBAAGjgcAwgb0wHQYDVR0OBBYEFDBi3LtzvdE+
+						AESqUKH8Dhkqn/LpMIGNBgNVHSMEgYUwgYKAFDBi3LtzvdE+AESqUKH8Dhkqn/Lp
+						oV+kXTBbMSUwIwYDVQQDExx3d3ctdGVzdC50b3BkZXNrLmlzLmVkLmFjLnVrMSUw
+						IwYDVQQKExx3d3ctdGVzdC50b3BkZXNrLmlzLmVkLmFjLnVrMQswCQYDVQQGEwJV
+						S4IJAOq3nFRbS3rJMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAAny
+						YIXTvm5eG+kSZSMBbkHoB56dz/ijfNvecp7Lx4UYMfqLij/uHDB3Hc5qLw1RcGvh
+						Awae8S11SbhWegJmMRjLfDHlhb/Ah1l7ouu2HWYW4LKqdy35BI3Yc/jcyNJ/zTP/
+						Iukm2hWuTVc3wlgz0VcWuX/ns/nfpoRWYIJne2opY7Di22zJdPZzdLOeRiZv2Jw9
+						fgYEIS5LBJ7vSo9W8oEqr8miskPEqT5wXca6osDp0MTx3pyfH3Uu/497gtsBSX9q
+						rCmsI2MfzzLnlrx3VpzkwP++KDC4bvf8/TAOw/LziEv19ezSBN+34bMvuh9FdNLk
+						dFAT0uiujIjT3M6S340=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ed.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Unidesk - University of Edinburgh (test)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IS Apps Technology Management</GivenName>
+    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml b/swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml
index 8b9912b2..22304654 100644
--- a/swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml
+++ b/swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml
@@ -82,63 +82,63 @@ PbS4vQ==
       <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="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="eduOrgLegalName" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="supannListeRouge" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="supannEtuId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEmpId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannAutreTelephone" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEntiteAffectationPrincipale" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="supannEtablissement" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannMailPerso" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannActivite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannRole" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannRoleGenerique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannRoleEntite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtuAnneeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.25" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtuCursusAnnee" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.26" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtuDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.27" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtuElementPedagogique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.28" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtuEtape" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.29" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannOrganisme" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="supannEtuInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.30" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="supannEtuRegimeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.31" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtuSecteurDisciplinaire" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.32" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="supannEtuTypeDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.33" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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:RequestedAttribute FriendlyName="supannAutreMail" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannCivilite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEntiteAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannCodeINE" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mailForwardingAddress" Name="urn:oid:2.16.840.1.113730.3.1.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..3766d11d
--- /dev/null
+++ b/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.napier.unidesk.ac.uk/tas/public/login/verify">
+  <!--
+		This is a "public" TOPDesk SP for the University of Edinburgh.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T09:17:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID5jCCAs6gAwIBAgIJAKmmxe2VazNBMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+						BAMTGXRlc3QubmFwaWVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QubmFw
+						aWVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDMyNTE0NDUyNVoX
+						DTI2MDMyMzE0NDUyNVowVTEiMCAGA1UEAxMZdGVzdC5uYXBpZXIudW5pZGVzay5h
+						Yy51azEiMCAGA1UEChMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azELMAkGA1UE
+						BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC155YdrjNo8XNz
+						HvpvZVos38MRNXfRErCpRzvJRUi8HGJqFWRTLOA1MMpxjL/P2Nw/n4W9PcN3OLW6
+						5WOeXVtB+wI/V1ptG9T+7NSnfdg4a+zLnS612tx7zYs4ylup1m0px7RgADgmvnnp
+						SSD/LO9ZlVuV1llrYM1EMt0xJCXFnlYqaMgqTpJ9bQdRhn+UakEchNS31lYWvnGY
+						xj+uUYO0ukYhf1RJMJqCCXwpMaUBloimwkF/COs6InnrjMO7yQSLHSDw6C1+0jla
+						Q7tjYfGfgWfMzWIDvAZiWXOxq54NgHI4xBstLTM5ynaRa7glGZ46rXNmtadkpFUu
+						tEN9XFfJAgMBAAGjgbgwgbUwHQYDVR0OBBYEFIOsVsQYekIKAIZkcAQ1JgQd9GaJ
+						MIGFBgNVHSMEfjB8gBSDrFbEGHpCCgCGZHAENSYEHfRmiaFZpFcwVTEiMCAGA1UE
+						AxMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC5uYXBp
+						ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQCppsXtlWszQTAMBgNVHRME
+						BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCcOV5eUITv5zxMeUZYFRWh7Vb1eEOK
+						TMao1dR5BrrTzmzindDU8z1WYGeGhbz7IOt6qx4lx2bCu5/lcCqN6j2TJ/Zc60Q0
+						0RPDa+ozlyu8EOwD6YuQhIoa813RUBPcV3ILyxsn8/H03HuSk+rDSziDrp0dL17q
+						qRAZ7DDiNXxVjsOOAKfwATlpBbK7WLP2VG0iMynU4W8YxDNyhQr1hD8aQug14bKI
+						FkzIoHsq1aZYLTSSbRmEm4SOd0nhG0N+DRElzuwzE4NJIYAH3wZEg8V6CvLPjLPm
+						yaZCgX4d+/NdqDiRw8ysu9XHE+tUXPC9XpWhRKbUV4qCmYsvtMzFYrrs
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID5jCCAs6gAwIBAgIJAKmmxe2VazNBMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+						BAMTGXRlc3QubmFwaWVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QubmFw
+						aWVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDMyNTE0NDUyNVoX
+						DTI2MDMyMzE0NDUyNVowVTEiMCAGA1UEAxMZdGVzdC5uYXBpZXIudW5pZGVzay5h
+						Yy51azEiMCAGA1UEChMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azELMAkGA1UE
+						BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC155YdrjNo8XNz
+						HvpvZVos38MRNXfRErCpRzvJRUi8HGJqFWRTLOA1MMpxjL/P2Nw/n4W9PcN3OLW6
+						5WOeXVtB+wI/V1ptG9T+7NSnfdg4a+zLnS612tx7zYs4ylup1m0px7RgADgmvnnp
+						SSD/LO9ZlVuV1llrYM1EMt0xJCXFnlYqaMgqTpJ9bQdRhn+UakEchNS31lYWvnGY
+						xj+uUYO0ukYhf1RJMJqCCXwpMaUBloimwkF/COs6InnrjMO7yQSLHSDw6C1+0jla
+						Q7tjYfGfgWfMzWIDvAZiWXOxq54NgHI4xBstLTM5ynaRa7glGZ46rXNmtadkpFUu
+						tEN9XFfJAgMBAAGjgbgwgbUwHQYDVR0OBBYEFIOsVsQYekIKAIZkcAQ1JgQd9GaJ
+						MIGFBgNVHSMEfjB8gBSDrFbEGHpCCgCGZHAENSYEHfRmiaFZpFcwVTEiMCAGA1UE
+						AxMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC5uYXBp
+						ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQCppsXtlWszQTAMBgNVHRME
+						BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCcOV5eUITv5zxMeUZYFRWh7Vb1eEOK
+						TMao1dR5BrrTzmzindDU8z1WYGeGhbz7IOt6qx4lx2bCu5/lcCqN6j2TJ/Zc60Q0
+						0RPDa+ozlyu8EOwD6YuQhIoa813RUBPcV3ILyxsn8/H03HuSk+rDSziDrp0dL17q
+						qRAZ7DDiNXxVjsOOAKfwATlpBbK7WLP2VG0iMynU4W8YxDNyhQr1hD8aQug14bKI
+						FkzIoHsq1aZYLTSSbRmEm4SOd0nhG0N+DRElzuwzE4NJIYAH3wZEg8V6CvLPjLPm
+						yaZCgX4d+/NdqDiRw8ysu9XHE+tUXPC9XpWhRKbUV4qCmYsvtMzFYrrs
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.napier.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Test Unidesk - Napier</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IS Apps Technology Management</GivenName>
+    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..02304867
--- /dev/null
+++ b/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.napier.unidesk.ac.uk/tas/secure/login/verify">
+  <!--
+		This is a "secure" TOPDesk SP for the University of Edinburgh.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T09:19:47Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID5jCCAs6gAwIBAgIJALDwEI9HqzwmMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+						BAMTGXRlc3QubmFwaWVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QubmFw
+						aWVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDMyNTE0NDUyNloX
+						DTI2MDMyMzE0NDUyNlowVTEiMCAGA1UEAxMZdGVzdC5uYXBpZXIudW5pZGVzay5h
+						Yy51azEiMCAGA1UEChMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azELMAkGA1UE
+						BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9CZdoVgdpI5GH
+						tLbxPGK7YsiaciujrnLSwBIDoiBiC9Ktg0v4aqUmXUO3qUpXRiQZ27zkPLBqWN2t
+						nI91lBMKB8pcsHVTAE9CGyZqDxrcA8qjVtSVogAaN9OAhZ246Rf9vcD6bD23kZ8b
+						p5VU+DKO4c630i7WpjYlTjiT1lBjMPaK8eIJa/cHdOGyV0ZsIE9mkXjOGz77nzQQ
+						b/XgSQBURFscEszUMvsDR6aiJD8tGhC1B04bfnZBTGlfod5P7LHb66DOYGHbobxZ
+						6ySBktMpBwAR5GjfxfZesKSfRYSJ7HH9AxeCfsMcl5IoxEHRm1rBRaZipGlrMjnE
+						a+fwHI/pAgMBAAGjgbgwgbUwHQYDVR0OBBYEFFRjbf5Cssg5VmJSaMbtUcecnSOo
+						MIGFBgNVHSMEfjB8gBRUY23+QrLIOVZiUmjG7VHHnJ0jqKFZpFcwVTEiMCAGA1UE
+						AxMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC5uYXBp
+						ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQCw8BCPR6s8JjAMBgNVHRME
+						BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBlYjCA1NO5uEvVIKnZ9Pp8fgtrlvCR
+						mWmTRJiB6UIwCxvulHPMSk3Yf8YInG0Uu85xImYF40pjI77t/Vxp0w9Dnr5AccO4
+						pOoB0aloZqW+iyNICvNhI4IEzoDbttPbRvb2HRcpahbySUQTrwVSni8cE9flBpBg
+						7LI1pZcPt5mnO3/9Pkod2/wCUE27hPLJG8IvzAZ8mHsFYSPWijiKkvmM4BoEDRJk
+						1YdtL5xTLOLE8C8NnNHOwyHC0S7NGnYiV+L6JPkP6DzZAILb3DYLEgXNGzjCnpNn
+						OEXG4w6V9oQj82r4pWPQ4RS99T86clSzjEPzlrUJO6cPMntuH3yuLHKA
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID5jCCAs6gAwIBAgIJALDwEI9HqzwmMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+						BAMTGXRlc3QubmFwaWVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QubmFw
+						aWVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDMyNTE0NDUyNloX
+						DTI2MDMyMzE0NDUyNlowVTEiMCAGA1UEAxMZdGVzdC5uYXBpZXIudW5pZGVzay5h
+						Yy51azEiMCAGA1UEChMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azELMAkGA1UE
+						BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9CZdoVgdpI5GH
+						tLbxPGK7YsiaciujrnLSwBIDoiBiC9Ktg0v4aqUmXUO3qUpXRiQZ27zkPLBqWN2t
+						nI91lBMKB8pcsHVTAE9CGyZqDxrcA8qjVtSVogAaN9OAhZ246Rf9vcD6bD23kZ8b
+						p5VU+DKO4c630i7WpjYlTjiT1lBjMPaK8eIJa/cHdOGyV0ZsIE9mkXjOGz77nzQQ
+						b/XgSQBURFscEszUMvsDR6aiJD8tGhC1B04bfnZBTGlfod5P7LHb66DOYGHbobxZ
+						6ySBktMpBwAR5GjfxfZesKSfRYSJ7HH9AxeCfsMcl5IoxEHRm1rBRaZipGlrMjnE
+						a+fwHI/pAgMBAAGjgbgwgbUwHQYDVR0OBBYEFFRjbf5Cssg5VmJSaMbtUcecnSOo
+						MIGFBgNVHSMEfjB8gBRUY23+QrLIOVZiUmjG7VHHnJ0jqKFZpFcwVTEiMCAGA1UE
+						AxMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC5uYXBp
+						ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQCw8BCPR6s8JjAMBgNVHRME
+						BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBlYjCA1NO5uEvVIKnZ9Pp8fgtrlvCR
+						mWmTRJiB6UIwCxvulHPMSk3Yf8YInG0Uu85xImYF40pjI77t/Vxp0w9Dnr5AccO4
+						pOoB0aloZqW+iyNICvNhI4IEzoDbttPbRvb2HRcpahbySUQTrwVSni8cE9flBpBg
+						7LI1pZcPt5mnO3/9Pkod2/wCUE27hPLJG8IvzAZ8mHsFYSPWijiKkvmM4BoEDRJk
+						1YdtL5xTLOLE8C8NnNHOwyHC0S7NGnYiV+L6JPkP6DzZAILb3DYLEgXNGzjCnpNn
+						OEXG4w6V9oQj82r4pWPQ4RS99T86clSzjEPzlrUJO6cPMntuH3yuLHKA
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.napier.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Test Unidesk - Napier</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IS Apps Technology Management</GivenName>
+    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</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
deleted file mode 100644
index fcd30142..00000000
--- a/swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.openathens.net/oala/metadata">
-  <!--
-		This is an OpenAthens LA Test IdP for Eduserv.
-	-->
-  <Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-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"/>
-  </Extensions>
-  <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">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">test.openathens.net</shibmd:Scope>
-    </Extensions>
-    <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>
-    </KeyDescriptor>
-    <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>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://runtime.test.openathens.net/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://runtime.test.openathens.net/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..8e4f718d
--- /dev/null
+++ b/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.shu.unidesk.ac.uk/tas/public/login/verify">
+  <!--
+		This is a "public Sheffield Hallam" TOPDesk SP for the University of Edinburgh.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:20:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID0zCCArugAwIBAgIJAIZxYEaEw5lGMA0GCSqGSIb3DQEBCwUAME8xHzAdBgNV
+						BAMTFnRlc3Quc2h1LnVuaWRlc2suYWMudWsxHzAdBgNVBAoTFnRlc3Quc2h1LnVu
+						aWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzYxOFoXDTI2MDMz
+						MDEyMzYxOFowTzEfMB0GA1UEAxMWdGVzdC5zaHUudW5pZGVzay5hYy51azEfMB0G
+						A1UEChMWdGVzdC5zaHUudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJJlXnctUpVTPqInQC60gcrfsD4m5m
+						GTWAWSXlYhKDfq6F7JZe0Nrph06Mx/SYqzwmSJWr9LeyA7gZaR/5lGR9rxAUn26/
+						Zvz14VxsTQlP2YnEePcAwyi698wulMGELyPN4zgo+oEBBpuRDXGqYH7OjqCI+Ktc
+						GJ77yE6XM6TNTLMFFB93QdooI1QXcyOYjhYBq7PpRY4jkyozAW28GJMu6lBdpLua
+						FoGw2N/Qy3aUFQ6WxK2If4URZqjj+W56vZj9COsAGonUO9RxiEFIyp3e+qBW0ua8
+						xps4G4tvV8PT23SGu5caTsAMkx/xdByTso4F5IAO6YLA9SXCDHkfwiX1AgMBAAGj
+						gbEwga4wHQYDVR0OBBYEFDb5sE6vS/3tZXp/gPQKykHPSLV+MH8GA1UdIwR4MHaA
+						FDb5sE6vS/3tZXp/gPQKykHPSLV+oVOkUTBPMR8wHQYDVQQDExZ0ZXN0LnNodS51
+						bmlkZXNrLmFjLnVrMR8wHQYDVQQKExZ0ZXN0LnNodS51bmlkZXNrLmFjLnVrMQsw
+						CQYDVQQGEwJVS4IJAIZxYEaEw5lGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
+						BQADggEBAFBE8uejSEiTBVTy3ehydf78gUIz2mfDjtFFnoTK4Atok6I2ABqeXAlB
+						p2LQ1dwM6nS3Or8dctOtx8aRmcvf8DTXWCcC3dSSLeU8lzl/GnBeGMKEoYAKmWVz
+						p0O1/0XtuRc1m1j0OzCUnuDAI0Vn31fby2Q0oGYdwTGeCd+DjoEbCVLUPGGerb9T
+						seyS9bm/fmyGdlKw6Y44M7Cj9crf7faGZkDbdXxIf+mCyQBNBS0X90LMHFcR/gr/
+						V6IR7SHk+cpzw5ENh4+25GYzL0/qYDhp8YSYqU5ioWRqTLOZf11dLSWUQZUHmFE+
+						siyQlKd1yPLqIHp5HYHIQLLIZN+HLlM=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID0zCCArugAwIBAgIJAIZxYEaEw5lGMA0GCSqGSIb3DQEBCwUAME8xHzAdBgNV
+						BAMTFnRlc3Quc2h1LnVuaWRlc2suYWMudWsxHzAdBgNVBAoTFnRlc3Quc2h1LnVu
+						aWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzYxOFoXDTI2MDMz
+						MDEyMzYxOFowTzEfMB0GA1UEAxMWdGVzdC5zaHUudW5pZGVzay5hYy51azEfMB0G
+						A1UEChMWdGVzdC5zaHUudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJJlXnctUpVTPqInQC60gcrfsD4m5m
+						GTWAWSXlYhKDfq6F7JZe0Nrph06Mx/SYqzwmSJWr9LeyA7gZaR/5lGR9rxAUn26/
+						Zvz14VxsTQlP2YnEePcAwyi698wulMGELyPN4zgo+oEBBpuRDXGqYH7OjqCI+Ktc
+						GJ77yE6XM6TNTLMFFB93QdooI1QXcyOYjhYBq7PpRY4jkyozAW28GJMu6lBdpLua
+						FoGw2N/Qy3aUFQ6WxK2If4URZqjj+W56vZj9COsAGonUO9RxiEFIyp3e+qBW0ua8
+						xps4G4tvV8PT23SGu5caTsAMkx/xdByTso4F5IAO6YLA9SXCDHkfwiX1AgMBAAGj
+						gbEwga4wHQYDVR0OBBYEFDb5sE6vS/3tZXp/gPQKykHPSLV+MH8GA1UdIwR4MHaA
+						FDb5sE6vS/3tZXp/gPQKykHPSLV+oVOkUTBPMR8wHQYDVQQDExZ0ZXN0LnNodS51
+						bmlkZXNrLmFjLnVrMR8wHQYDVQQKExZ0ZXN0LnNodS51bmlkZXNrLmFjLnVrMQsw
+						CQYDVQQGEwJVS4IJAIZxYEaEw5lGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
+						BQADggEBAFBE8uejSEiTBVTy3ehydf78gUIz2mfDjtFFnoTK4Atok6I2ABqeXAlB
+						p2LQ1dwM6nS3Or8dctOtx8aRmcvf8DTXWCcC3dSSLeU8lzl/GnBeGMKEoYAKmWVz
+						p0O1/0XtuRc1m1j0OzCUnuDAI0Vn31fby2Q0oGYdwTGeCd+DjoEbCVLUPGGerb9T
+						seyS9bm/fmyGdlKw6Y44M7Cj9crf7faGZkDbdXxIf+mCyQBNBS0X90LMHFcR/gr/
+						V6IR7SHk+cpzw5ENh4+25GYzL0/qYDhp8YSYqU5ioWRqTLOZf11dLSWUQZUHmFE+
+						siyQlKd1yPLqIHp5HYHIQLLIZN+HLlM=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.shu.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Test Unidesk - Sheffiield Hallam</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IS Apps Technology Management</GivenName>
+    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..e4039b6b
--- /dev/null
+++ b/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.shu.unidesk.ac.uk/tas/secure/login/verify">
+  <!--
+		This is a "secure Sheffield Hallam" TOPDesk SP for the University of Edinburgh.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:24:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID0zCCArugAwIBAgIJALBHKHpsKjfyMA0GCSqGSIb3DQEBCwUAME8xHzAdBgNV
+						BAMTFnRlc3Quc2h1LnVuaWRlc2suYWMudWsxHzAdBgNVBAoTFnRlc3Quc2h1LnVu
+						aWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzYxOVoXDTI2MDMz
+						MDEyMzYxOVowTzEfMB0GA1UEAxMWdGVzdC5zaHUudW5pZGVzay5hYy51azEfMB0G
+						A1UEChMWdGVzdC5zaHUudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6BE+AHvxhh5q88U3GlX556bzJjhZu
+						limEOPyhKIEuZMmygWR01GO/1zZGLSIdnF/7StnZyJwn4Z1CLzaCzHGTMq4lVoiI
+						JYsydP/J+E8yO5fpITM3/zq+3yApmcexJKGhJq6E/uvzKWo6DofPvHz6sgAFKIH7
+						XPk/KR2vUOb3Vu1CkhxsN1YGzGuN7+FAWnoxDtGSUvu/3j4YuWZ8t/+OblntSH4W
+						hVL+/UV9QKf9Kgqd/wIzehQuMqAQdtxGCkKQO2m1Bc5bH++jfvBL3rPY7QMNl2hE
+						WkxW6P2FYoDqaXYXj5trNPxf1Fi3gMFvr7Po+hzTLlNH+Tqf990US6kvAgMBAAGj
+						gbEwga4wHQYDVR0OBBYEFMc2jbMrxfUP/MwpLJn7GnBWwN5GMH8GA1UdIwR4MHaA
+						FMc2jbMrxfUP/MwpLJn7GnBWwN5GoVOkUTBPMR8wHQYDVQQDExZ0ZXN0LnNodS51
+						bmlkZXNrLmFjLnVrMR8wHQYDVQQKExZ0ZXN0LnNodS51bmlkZXNrLmFjLnVrMQsw
+						CQYDVQQGEwJVS4IJALBHKHpsKjfyMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
+						BQADggEBAGCe0HFNZpIWDAGeADGdJHOmp/Z8qaTVLxpBbo1a4R6PxZ94vAQ+h5/Q
+						IzbXfCxSlMhRJXgsD95039M4mSdQf3HoF9N+q7HAp/uR6H7uyMUwXANnoEdCpIqx
+						E8c64IxOPPL/1lCXjf45Dw9SheVAa88crlQPCgZLM8jdZEcuV1MSyTbwqy61LW2a
+						wjSfU2D+uDKdXg3SSbBd3ZXM4S1ca2FM59Jbn+WEvyZfdm8Mq7Sgo2BYPDAJN8u5
+						pGSWHqxUKYeFTFZfnKMVJt3nQWdYezNeBSSaBDVjE8MpOevfSTINlrNs63yVBTDe
+						TyVSTqgYbbTOk1MtZWZr4+LMXyo66QI=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID0zCCArugAwIBAgIJALBHKHpsKjfyMA0GCSqGSIb3DQEBCwUAME8xHzAdBgNV
+						BAMTFnRlc3Quc2h1LnVuaWRlc2suYWMudWsxHzAdBgNVBAoTFnRlc3Quc2h1LnVu
+						aWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzYxOVoXDTI2MDMz
+						MDEyMzYxOVowTzEfMB0GA1UEAxMWdGVzdC5zaHUudW5pZGVzay5hYy51azEfMB0G
+						A1UEChMWdGVzdC5zaHUudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6BE+AHvxhh5q88U3GlX556bzJjhZu
+						limEOPyhKIEuZMmygWR01GO/1zZGLSIdnF/7StnZyJwn4Z1CLzaCzHGTMq4lVoiI
+						JYsydP/J+E8yO5fpITM3/zq+3yApmcexJKGhJq6E/uvzKWo6DofPvHz6sgAFKIH7
+						XPk/KR2vUOb3Vu1CkhxsN1YGzGuN7+FAWnoxDtGSUvu/3j4YuWZ8t/+OblntSH4W
+						hVL+/UV9QKf9Kgqd/wIzehQuMqAQdtxGCkKQO2m1Bc5bH++jfvBL3rPY7QMNl2hE
+						WkxW6P2FYoDqaXYXj5trNPxf1Fi3gMFvr7Po+hzTLlNH+Tqf990US6kvAgMBAAGj
+						gbEwga4wHQYDVR0OBBYEFMc2jbMrxfUP/MwpLJn7GnBWwN5GMH8GA1UdIwR4MHaA
+						FMc2jbMrxfUP/MwpLJn7GnBWwN5GoVOkUTBPMR8wHQYDVQQDExZ0ZXN0LnNodS51
+						bmlkZXNrLmFjLnVrMR8wHQYDVQQKExZ0ZXN0LnNodS51bmlkZXNrLmFjLnVrMQsw
+						CQYDVQQGEwJVS4IJALBHKHpsKjfyMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
+						BQADggEBAGCe0HFNZpIWDAGeADGdJHOmp/Z8qaTVLxpBbo1a4R6PxZ94vAQ+h5/Q
+						IzbXfCxSlMhRJXgsD95039M4mSdQf3HoF9N+q7HAp/uR6H7uyMUwXANnoEdCpIqx
+						E8c64IxOPPL/1lCXjf45Dw9SheVAa88crlQPCgZLM8jdZEcuV1MSyTbwqy61LW2a
+						wjSfU2D+uDKdXg3SSbBd3ZXM4S1ca2FM59Jbn+WEvyZfdm8Mq7Sgo2BYPDAJN8u5
+						pGSWHqxUKYeFTFZfnKMVJt3nQWdYezNeBSSaBDVjE8MpOevfSTINlrNs63yVBTDe
+						TyVSTqgYbbTOk1MtZWZr4+LMXyo66QI=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.shu.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Test Unidesk - Sheffield Hallam</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IS Apps Technology Management</GivenName>
+    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..c2dd3a45
--- /dev/null
+++ b/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.st-andrews.unidesk.ac.uk/tas/public/login/verify">
+  <!--
+		This is a "public St Andrews" TOPDesk SP for the University of Edinburgh.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:31:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEADCCAuigAwIBAgIJAIhMwPcgL4J5MA0GCSqGSIb3DQEBCwUAMF0xJjAkBgNV
+						BAMTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMSYwJAYDVQQKEx10ZXN0
+						LnN0LWFuZHJld3MudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAx
+						MTIzNjUwWhcNMjYwMzMwMTIzNjUwWjBdMSYwJAYDVQQDEx10ZXN0LnN0LWFuZHJl
+						d3MudW5pZGVzay5hYy51azEmMCQGA1UEChMddGVzdC5zdC1hbmRyZXdzLnVuaWRl
+						c2suYWMudWsxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAvBcmVk31O/rqO8dyHPtQO+zFANQpbcQo+roH+vJ4QZ/f5JV/BSEzdRY8
+						mqaEV3YFg6a45kwYLum/hBBHsgCiu6qzByANuqjvqF2q+O4oJ2dIPlUW4g9BF/UY
+						otVDcMySPQ7siPagE1arNivCZ+aAwcmxHiuZsJOIzg+kHgYFPfGeD11VVTZyPED3
+						aU5y/lrmU5X5rnQWRNnBoXZX6WXmaNY9wMJbjSWzPlC47qlmXgdQC8cbtdVFuPkx
+						bC7lGLcwnQRrLDD3gRrX1RiQ88nL9HWQNdydjkMoFR7lwvhSUbdyeatMwbHZOcU5
+						VzIR/XIpaHYXuNMfJqHcFHBOR2jD3QIDAQABo4HCMIG/MB0GA1UdDgQWBBTLoPSB
+						7fSfWEPknMfVn8Iy20sngDCBjwYDVR0jBIGHMIGEgBTLoPSB7fSfWEPknMfVn8Iy
+						20sngKFhpF8wXTEmMCQGA1UEAxMddGVzdC5zdC1hbmRyZXdzLnVuaWRlc2suYWMu
+						dWsxJjAkBgNVBAoTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMQswCQYD
+						VQQGEwJVS4IJAIhMwPcgL4J5MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+						ggEBAB+o2KHNBwJgL1fP5DEBPTxO6s3t2NIf2YNNF400XOFCNXgtf2OxcT0YpiVc
+						kK+oVYXdGXUsLXYVALL4SdV3rzr4f0CFfJAhkys5W1aXWn/2TFfWNLyMwsupIqsJ
+						t89ibeUf4T/hQfWBIML05G9+IuN/nZNyoL8Gf+iyTOL89TeEPxRzzfKG8aNODiXk
+						pugdN/9rBMZjbrbeMbrA9XGbz7OBi8ugeSE9rH6XzhTQu6uiZP0zKyPta6XzO5H1
+						0QyClOifYBk4hUb9/SykFPKtpM1VVDgQ9IMND6WaT1L/JjAumGcnnuRRySj+63/i
+						QaeR6JDD8INXBiQ9NMNkI33uQZY=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEADCCAuigAwIBAgIJAIhMwPcgL4J5MA0GCSqGSIb3DQEBCwUAMF0xJjAkBgNV
+						BAMTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMSYwJAYDVQQKEx10ZXN0
+						LnN0LWFuZHJld3MudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAx
+						MTIzNjUwWhcNMjYwMzMwMTIzNjUwWjBdMSYwJAYDVQQDEx10ZXN0LnN0LWFuZHJl
+						d3MudW5pZGVzay5hYy51azEmMCQGA1UEChMddGVzdC5zdC1hbmRyZXdzLnVuaWRl
+						c2suYWMudWsxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAvBcmVk31O/rqO8dyHPtQO+zFANQpbcQo+roH+vJ4QZ/f5JV/BSEzdRY8
+						mqaEV3YFg6a45kwYLum/hBBHsgCiu6qzByANuqjvqF2q+O4oJ2dIPlUW4g9BF/UY
+						otVDcMySPQ7siPagE1arNivCZ+aAwcmxHiuZsJOIzg+kHgYFPfGeD11VVTZyPED3
+						aU5y/lrmU5X5rnQWRNnBoXZX6WXmaNY9wMJbjSWzPlC47qlmXgdQC8cbtdVFuPkx
+						bC7lGLcwnQRrLDD3gRrX1RiQ88nL9HWQNdydjkMoFR7lwvhSUbdyeatMwbHZOcU5
+						VzIR/XIpaHYXuNMfJqHcFHBOR2jD3QIDAQABo4HCMIG/MB0GA1UdDgQWBBTLoPSB
+						7fSfWEPknMfVn8Iy20sngDCBjwYDVR0jBIGHMIGEgBTLoPSB7fSfWEPknMfVn8Iy
+						20sngKFhpF8wXTEmMCQGA1UEAxMddGVzdC5zdC1hbmRyZXdzLnVuaWRlc2suYWMu
+						dWsxJjAkBgNVBAoTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMQswCQYD
+						VQQGEwJVS4IJAIhMwPcgL4J5MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+						ggEBAB+o2KHNBwJgL1fP5DEBPTxO6s3t2NIf2YNNF400XOFCNXgtf2OxcT0YpiVc
+						kK+oVYXdGXUsLXYVALL4SdV3rzr4f0CFfJAhkys5W1aXWn/2TFfWNLyMwsupIqsJ
+						t89ibeUf4T/hQfWBIML05G9+IuN/nZNyoL8Gf+iyTOL89TeEPxRzzfKG8aNODiXk
+						pugdN/9rBMZjbrbeMbrA9XGbz7OBi8ugeSE9rH6XzhTQu6uiZP0zKyPta6XzO5H1
+						0QyClOifYBk4hUb9/SykFPKtpM1VVDgQ9IMND6WaT1L/JjAumGcnnuRRySj+63/i
+						QaeR6JDD8INXBiQ9NMNkI33uQZY=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.st-andrews.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Test Unidesk - St Andrews</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IS Apps Technology Management</GivenName>
+    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..dc066cb5
--- /dev/null
+++ b/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.st-andrews.unidesk.ac.uk/tas/secure/login/verify">
+  <!--
+		This is a "secure St Andrews" TOPDesk SP for the University of Edinburgh.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:34:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEADCCAuigAwIBAgIJAL3Y8PpzyOKTMA0GCSqGSIb3DQEBCwUAMF0xJjAkBgNV
+						BAMTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMSYwJAYDVQQKEx10ZXN0
+						LnN0LWFuZHJld3MudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAx
+						MTIzNjUxWhcNMjYwMzMwMTIzNjUxWjBdMSYwJAYDVQQDEx10ZXN0LnN0LWFuZHJl
+						d3MudW5pZGVzay5hYy51azEmMCQGA1UEChMddGVzdC5zdC1hbmRyZXdzLnVuaWRl
+						c2suYWMudWsxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAzAL+qWB1ilhsj9Up9IOTrKbobvYAAuBvy5ea9KePlZNaxZ9D2/fye1WL
+						zAtzBVBUZxofWYbkmQ31Av0OT4QPXcR3Koqs6HkjBJatjRJ5jdlyG98j0EEEXfb/
+						sT5MQ/U4YauOf2H7c8M/JP8+PL97r/3eAaiMnya/CRZZDkqE2Ib1mQVvGX5Jl++G
+						tVumwW0v2GRLIFWgNByF62vNIPNDfM7+EPiZSE2vxIJ1uIB/Zbc4CTgU9Ah4W2cc
+						xAMeEm/7TL75HCs3ZfKXbjZSNB7QpdCgQCpREHjKPVg6xAazsbXXQ66byCt10fic
+						X9OeztcDJdj0tIgTl7tU9oZ8BGCbBwIDAQABo4HCMIG/MB0GA1UdDgQWBBQiT0Yu
+						SG+CekTXxr0u1lengc4v5TCBjwYDVR0jBIGHMIGEgBQiT0YuSG+CekTXxr0u1len
+						gc4v5aFhpF8wXTEmMCQGA1UEAxMddGVzdC5zdC1hbmRyZXdzLnVuaWRlc2suYWMu
+						dWsxJjAkBgNVBAoTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMQswCQYD
+						VQQGEwJVS4IJAL3Y8PpzyOKTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+						ggEBAEWMQiWOK6hKtuggI21WHZ2WSXc+LqchHtjbqcipHhPsR7tH2kzIxaqawRRB
+						jaiZZ22nyDurQ4um2rVG25dxFFA1EM+OjuKKEiwDmWMNkypRa19O4vq3WhdF2CKq
+						DVC+wFRVRIvA+CFYnQt3v1Lj/ZFWmUgfH1DhBg9D2ff7hKsCO/6pvl1XLIkM+rvO
+						6F4ojfCzs8ZE4ZEXe9Tvddmv0bsVdMk5Px81i8vPd+z4vgfHnnzYS4ZLrxifKAhW
+						WufvINMxu4brjSiVcSFmZqwo2rD/tzI7d7Ax+n/ziLxULAEBTg1AT2t3aAELPj/m
+						HoIyjVh4zNDQNVRgra00piqEoZU=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEADCCAuigAwIBAgIJAL3Y8PpzyOKTMA0GCSqGSIb3DQEBCwUAMF0xJjAkBgNV
+						BAMTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMSYwJAYDVQQKEx10ZXN0
+						LnN0LWFuZHJld3MudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAx
+						MTIzNjUxWhcNMjYwMzMwMTIzNjUxWjBdMSYwJAYDVQQDEx10ZXN0LnN0LWFuZHJl
+						d3MudW5pZGVzay5hYy51azEmMCQGA1UEChMddGVzdC5zdC1hbmRyZXdzLnVuaWRl
+						c2suYWMudWsxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAzAL+qWB1ilhsj9Up9IOTrKbobvYAAuBvy5ea9KePlZNaxZ9D2/fye1WL
+						zAtzBVBUZxofWYbkmQ31Av0OT4QPXcR3Koqs6HkjBJatjRJ5jdlyG98j0EEEXfb/
+						sT5MQ/U4YauOf2H7c8M/JP8+PL97r/3eAaiMnya/CRZZDkqE2Ib1mQVvGX5Jl++G
+						tVumwW0v2GRLIFWgNByF62vNIPNDfM7+EPiZSE2vxIJ1uIB/Zbc4CTgU9Ah4W2cc
+						xAMeEm/7TL75HCs3ZfKXbjZSNB7QpdCgQCpREHjKPVg6xAazsbXXQ66byCt10fic
+						X9OeztcDJdj0tIgTl7tU9oZ8BGCbBwIDAQABo4HCMIG/MB0GA1UdDgQWBBQiT0Yu
+						SG+CekTXxr0u1lengc4v5TCBjwYDVR0jBIGHMIGEgBQiT0YuSG+CekTXxr0u1len
+						gc4v5aFhpF8wXTEmMCQGA1UEAxMddGVzdC5zdC1hbmRyZXdzLnVuaWRlc2suYWMu
+						dWsxJjAkBgNVBAoTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMQswCQYD
+						VQQGEwJVS4IJAL3Y8PpzyOKTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+						ggEBAEWMQiWOK6hKtuggI21WHZ2WSXc+LqchHtjbqcipHhPsR7tH2kzIxaqawRRB
+						jaiZZ22nyDurQ4um2rVG25dxFFA1EM+OjuKKEiwDmWMNkypRa19O4vq3WhdF2CKq
+						DVC+wFRVRIvA+CFYnQt3v1Lj/ZFWmUgfH1DhBg9D2ff7hKsCO/6pvl1XLIkM+rvO
+						6F4ojfCzs8ZE4ZEXe9Tvddmv0bsVdMk5Px81i8vPd+z4vgfHnnzYS4ZLrxifKAhW
+						WufvINMxu4brjSiVcSFmZqwo2rD/tzI7d7Ax+n/ziLxULAEBTg1AT2t3aAELPj/m
+						HoIyjVh4zNDQNVRgra00piqEoZU=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.st-andrews.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Test Unidesk - St Andrews</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IS Apps Technology Management</GivenName>
+    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..609183a7
--- /dev/null
+++ b/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.stir.unidesk.ac.uk/tas/public/login/verify">
+  <!--
+		This is a "public Stirling" TOPDesk SP for the University of Edinburgh.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:47:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID2jCCAsKgAwIBAgIJANyOrK6P4z4IMA0GCSqGSIb3DQEBCwUAMFExIDAeBgNV
+						BAMTF3Rlc3Quc3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIu
+						dW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNzE4WhcNMjYw
+						MzMwMTIzNzE4WjBRMSAwHgYDVQQDExd0ZXN0LnN0aXIudW5pZGVzay5hYy51azEg
+						MB4GA1UEChMXdGVzdC5zdGlyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0/TrlARELCO2seaUN5x9qwXm
+						oMpDksEGPHgRa40wqvHnF/1ebwuJ/a0L2XW7OLt1Lg4J5N1B/VxJ76qt4c9rqY0k
+						fKAcbwLjUDXLG4R61/ixw1U5g8TkxGWs/b1QZzYN1mXGqYZXQEehau4jrsLlj5u+
+						2llO5Io0AkRSOYjZCjd1lWaqj4nVYJD8EVIugxnzJZ6Er3sys+izkhwUXueJSieJ
+						TOPurN9fHt/qiwg8OY+v8rUfHM6c6tGQHrYEThad+fzhfS8mATMs0Ghw85vGYiqn
+						VBece+oe4iTxmZyFXr3Syd+Nwb8WBlH0DDrj9SVC2HLttXsHTRexKOAeXjTzNwID
+						AQABo4G0MIGxMB0GA1UdDgQWBBQ5yaFQUQPTK5YABLJFqvVyQyTx/DCBgQYDVR0j
+						BHoweIAUOcmhUFED0yuWAASyRar1ckMk8fyhVaRTMFExIDAeBgNVBAMTF3Rlc3Qu
+						c3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIudW5pZGVzay5h
+						Yy51azELMAkGA1UEBhMCVUuCCQDcjqyuj+M+CDAMBgNVHRMEBTADAQH/MA0GCSqG
+						SIb3DQEBCwUAA4IBAQBGPthismR3ASkL4uXomIVPyWLvAEwfuOInJXcAWFTUzuXM
+						NsnEqPjIY+oq9sC9ALo0Ne7X0MhXaBie+P/+tZMRq6EoYT0moDMIsFC/MZaEiRUa
+						6mhwksA4PVEwhYEqL2C0HtpkIB5eJ7cqnQCQIlsSxQYUVP/J01rW/WX5CDnaVG+l
+						sINoMQr42MaRYjduErB1j0WvpN+p+g98NS9vSPCcFTFTK28syLDlgDPwlPYTAfV7
+						/z1ISaVQYVdUyh+sUrWuY2lHH3u9OtoE7FZrA2YUkD+fV3MzlIrRX/Ku8/iq+bqe
+						lRHGvV+PFtz4Y8zu1o61fq5+Fm2S0oHYtgDRVudH
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID2jCCAsKgAwIBAgIJANyOrK6P4z4IMA0GCSqGSIb3DQEBCwUAMFExIDAeBgNV
+						BAMTF3Rlc3Quc3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIu
+						dW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNzE4WhcNMjYw
+						MzMwMTIzNzE4WjBRMSAwHgYDVQQDExd0ZXN0LnN0aXIudW5pZGVzay5hYy51azEg
+						MB4GA1UEChMXdGVzdC5zdGlyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0/TrlARELCO2seaUN5x9qwXm
+						oMpDksEGPHgRa40wqvHnF/1ebwuJ/a0L2XW7OLt1Lg4J5N1B/VxJ76qt4c9rqY0k
+						fKAcbwLjUDXLG4R61/ixw1U5g8TkxGWs/b1QZzYN1mXGqYZXQEehau4jrsLlj5u+
+						2llO5Io0AkRSOYjZCjd1lWaqj4nVYJD8EVIugxnzJZ6Er3sys+izkhwUXueJSieJ
+						TOPurN9fHt/qiwg8OY+v8rUfHM6c6tGQHrYEThad+fzhfS8mATMs0Ghw85vGYiqn
+						VBece+oe4iTxmZyFXr3Syd+Nwb8WBlH0DDrj9SVC2HLttXsHTRexKOAeXjTzNwID
+						AQABo4G0MIGxMB0GA1UdDgQWBBQ5yaFQUQPTK5YABLJFqvVyQyTx/DCBgQYDVR0j
+						BHoweIAUOcmhUFED0yuWAASyRar1ckMk8fyhVaRTMFExIDAeBgNVBAMTF3Rlc3Qu
+						c3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIudW5pZGVzay5h
+						Yy51azELMAkGA1UEBhMCVUuCCQDcjqyuj+M+CDAMBgNVHRMEBTADAQH/MA0GCSqG
+						SIb3DQEBCwUAA4IBAQBGPthismR3ASkL4uXomIVPyWLvAEwfuOInJXcAWFTUzuXM
+						NsnEqPjIY+oq9sC9ALo0Ne7X0MhXaBie+P/+tZMRq6EoYT0moDMIsFC/MZaEiRUa
+						6mhwksA4PVEwhYEqL2C0HtpkIB5eJ7cqnQCQIlsSxQYUVP/J01rW/WX5CDnaVG+l
+						sINoMQr42MaRYjduErB1j0WvpN+p+g98NS9vSPCcFTFTK28syLDlgDPwlPYTAfV7
+						/z1ISaVQYVdUyh+sUrWuY2lHH3u9OtoE7FZrA2YUkD+fV3MzlIrRX/Ku8/iq+bqe
+						lRHGvV+PFtz4Y8zu1o61fq5+Fm2S0oHYtgDRVudH
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.stir.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Test Unidesk - Stirling</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IS Apps Technology Management</GivenName>
+    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..a646ebb4
--- /dev/null
+++ b/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.stir.unidesk.ac.uk/tas/secure/login/verify">
+  <!--
+		This is a "secure Stirling" TOPDesk SP for the University of Edinburgh.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:49:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID2jCCAsKgAwIBAgIJALr8CP8PS5BEMA0GCSqGSIb3DQEBCwUAMFExIDAeBgNV
+						BAMTF3Rlc3Quc3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIu
+						dW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNzE5WhcNMjYw
+						MzMwMTIzNzE5WjBRMSAwHgYDVQQDExd0ZXN0LnN0aXIudW5pZGVzay5hYy51azEg
+						MB4GA1UEChMXdGVzdC5zdGlyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApgFf2q8W/UjaWOZdNqr9EmOa
+						WG0l2hEosA+IAHcKkdBNdMhNGzED45WLadguUY1F+Irnft2DF/52/rukG/XuFkM1
+						SybLxZdme3ozG91w+TB86/BPTNOl16P2Q3QQ90FdkqZY/rWPMwIRVA5mjKuf6+1T
+						5PL9/XpQC9JFwXmUXNsNsLJryDgm+13wugMPymrgWmFGZN2HYlSv5TF5mIxVQOYC
+						SjsGZhu88GmRjMxHN1T6OAn7a4HA7/wlEfnl8SQ5TIWPRjQukN9hg/CpYC2zI17G
+						/606x/P4lkJ37/NErZ/u4ueA4ymhyWSbLFX8MsFDymiTghJu/7N1Z9nY/ePklQID
+						AQABo4G0MIGxMB0GA1UdDgQWBBRa1jo5LhT5i8tbKUA76iynFS7CnDCBgQYDVR0j
+						BHoweIAUWtY6OS4U+YvLWylAO+ospxUuwpyhVaRTMFExIDAeBgNVBAMTF3Rlc3Qu
+						c3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIudW5pZGVzay5h
+						Yy51azELMAkGA1UEBhMCVUuCCQC6/Aj/D0uQRDAMBgNVHRMEBTADAQH/MA0GCSqG
+						SIb3DQEBCwUAA4IBAQAx2Xfd1pfAlPepfSX4KUPbhJaq+Z2695FVOW+KqBC/L6db
+						jyUYQtoi1X9yge4FaVNt1GMMUv9XVcvH6O7UTLdXBiSXXW/BbhLzRgnf09Mtta0y
+						skCRNaStwWbIrDFRegIk0rFUya3n2oR5B5ZW0ah7C93sxYbVbSMZmVfUpf/oZY79
+						UZhImwhWAzMfvKgzPySFAXOmoShseo6hrOTyeWJgVxT4EKtifhyhdTZDkT8XykbX
+						CA34rv87jODyi+dYGhbegFiuJoDo/9/weL0BH5N48yW18sSjRkURF5VXGbPMUx96
+						8Knhux1hK+cTlx1vIfHtJa81w/f3BtS7gweYmKp4
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID2jCCAsKgAwIBAgIJALr8CP8PS5BEMA0GCSqGSIb3DQEBCwUAMFExIDAeBgNV
+						BAMTF3Rlc3Quc3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIu
+						dW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNzE5WhcNMjYw
+						MzMwMTIzNzE5WjBRMSAwHgYDVQQDExd0ZXN0LnN0aXIudW5pZGVzay5hYy51azEg
+						MB4GA1UEChMXdGVzdC5zdGlyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApgFf2q8W/UjaWOZdNqr9EmOa
+						WG0l2hEosA+IAHcKkdBNdMhNGzED45WLadguUY1F+Irnft2DF/52/rukG/XuFkM1
+						SybLxZdme3ozG91w+TB86/BPTNOl16P2Q3QQ90FdkqZY/rWPMwIRVA5mjKuf6+1T
+						5PL9/XpQC9JFwXmUXNsNsLJryDgm+13wugMPymrgWmFGZN2HYlSv5TF5mIxVQOYC
+						SjsGZhu88GmRjMxHN1T6OAn7a4HA7/wlEfnl8SQ5TIWPRjQukN9hg/CpYC2zI17G
+						/606x/P4lkJ37/NErZ/u4ueA4ymhyWSbLFX8MsFDymiTghJu/7N1Z9nY/ePklQID
+						AQABo4G0MIGxMB0GA1UdDgQWBBRa1jo5LhT5i8tbKUA76iynFS7CnDCBgQYDVR0j
+						BHoweIAUWtY6OS4U+YvLWylAO+ospxUuwpyhVaRTMFExIDAeBgNVBAMTF3Rlc3Qu
+						c3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIudW5pZGVzay5h
+						Yy51azELMAkGA1UEBhMCVUuCCQC6/Aj/D0uQRDAMBgNVHRMEBTADAQH/MA0GCSqG
+						SIb3DQEBCwUAA4IBAQAx2Xfd1pfAlPepfSX4KUPbhJaq+Z2695FVOW+KqBC/L6db
+						jyUYQtoi1X9yge4FaVNt1GMMUv9XVcvH6O7UTLdXBiSXXW/BbhLzRgnf09Mtta0y
+						skCRNaStwWbIrDFRegIk0rFUya3n2oR5B5ZW0ah7C93sxYbVbSMZmVfUpf/oZY79
+						UZhImwhWAzMfvKgzPySFAXOmoShseo6hrOTyeWJgVxT4EKtifhyhdTZDkT8XykbX
+						CA34rv87jODyi+dYGhbegFiuJoDo/9/weL0BH5N48yW18sSjRkURF5VXGbPMUx96
+						8Knhux1hK+cTlx1vIfHtJa81w/f3BtS7gweYmKp4
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.stir.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Test Unidesk - Stirling</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IS Apps Technology Management</GivenName>
+    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..2147a82b
--- /dev/null
+++ b/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ulster.unidesk.ac.uk/tas/public/login/verify">
+  <!--
+		This is a "Test Unidesk - Ulster" TOPdesk SP for University of Edinburgh.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:26:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID5jCCAs6gAwIBAgIJALiPkubf7TWHMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+						BAMTGXRlc3QudWxzdGVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QudWxz
+						dGVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzc1M1oX
+						DTI2MDMzMDEyMzc1M1owVTEiMCAGA1UEAxMZdGVzdC51bHN0ZXIudW5pZGVzay5h
+						Yy51azEiMCAGA1UEChMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azELMAkGA1UE
+						BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCq3M/LdSd+6HtG
+						rsrULUV6WFiGMUdJqrto2MjG/MwjQGIDBr+5RLXKcD8CvgMbzTylSvuMZKwJLmUr
+						7ycjkbj42BmzNneWv08cFc8OilqVfKv1V5DwKnnwLyc9xCEQiTxFIanaxSQQlSz3
+						+BBUQz8vFztolXTYh/mswJkwBAfUSuJi01YO5AgT1Nz1UxevVWj5e9v3zvgrdTg0
+						9Jr+Dj1LvlHsplD8jRy9vjLKtpshATioNebMuhUbprWEC2PLy/+Bq9HJjZgulo3r
+						s9mX7BY/5FwFL1wD3zR/3XDZrqXl72KMa/9OvNIpucwWx7H8rvIs9UriR4T62t3x
+						NXDfMNszAgMBAAGjgbgwgbUwHQYDVR0OBBYEFBKtj0q4+ZplekDXtrmSsxPwKECF
+						MIGFBgNVHSMEfjB8gBQSrY9KuPmaZXpA17a5krMT8ChAhaFZpFcwVTEiMCAGA1UE
+						AxMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC51bHN0
+						ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQC4j5Lm3+01hzAMBgNVHRME
+						BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCGBbK+Ku25waBIn66a/9TYxow/v3sQ
+						DAtY3tqqZz1vlrf0ymHv8brMxZiaCwq3HNuQJEQpE/rgY9/w97pDVkoFq7TgSIRn
+						LmiHIztnW8RtnK80etS7tPJSV+Fes7sR/iIxXFtRY1iWXJ9CNFr6V5CUkudpvrIY
+						rYlU/r0ghRYAh6z9BeCiX1Ujx3vI3tOdG85LiaxDFBeUGq+EGZPFilMDdzCWVm92
+						y1GE4I0lT1fVZ0QQxNMz0ensIzIeh4JTgd6lbXm/l2G/NqaN3KXQ81jaahhC6omh
+						/8B1yAFVgKaK/PrHQuSpm4+zA+Qe3iFHtQ/TY3Nn2Sp3f8b/kzN4z6QI
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID5jCCAs6gAwIBAgIJALiPkubf7TWHMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+						BAMTGXRlc3QudWxzdGVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QudWxz
+						dGVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzc1M1oX
+						DTI2MDMzMDEyMzc1M1owVTEiMCAGA1UEAxMZdGVzdC51bHN0ZXIudW5pZGVzay5h
+						Yy51azEiMCAGA1UEChMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azELMAkGA1UE
+						BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCq3M/LdSd+6HtG
+						rsrULUV6WFiGMUdJqrto2MjG/MwjQGIDBr+5RLXKcD8CvgMbzTylSvuMZKwJLmUr
+						7ycjkbj42BmzNneWv08cFc8OilqVfKv1V5DwKnnwLyc9xCEQiTxFIanaxSQQlSz3
+						+BBUQz8vFztolXTYh/mswJkwBAfUSuJi01YO5AgT1Nz1UxevVWj5e9v3zvgrdTg0
+						9Jr+Dj1LvlHsplD8jRy9vjLKtpshATioNebMuhUbprWEC2PLy/+Bq9HJjZgulo3r
+						s9mX7BY/5FwFL1wD3zR/3XDZrqXl72KMa/9OvNIpucwWx7H8rvIs9UriR4T62t3x
+						NXDfMNszAgMBAAGjgbgwgbUwHQYDVR0OBBYEFBKtj0q4+ZplekDXtrmSsxPwKECF
+						MIGFBgNVHSMEfjB8gBQSrY9KuPmaZXpA17a5krMT8ChAhaFZpFcwVTEiMCAGA1UE
+						AxMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC51bHN0
+						ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQC4j5Lm3+01hzAMBgNVHRME
+						BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCGBbK+Ku25waBIn66a/9TYxow/v3sQ
+						DAtY3tqqZz1vlrf0ymHv8brMxZiaCwq3HNuQJEQpE/rgY9/w97pDVkoFq7TgSIRn
+						LmiHIztnW8RtnK80etS7tPJSV+Fes7sR/iIxXFtRY1iWXJ9CNFr6V5CUkudpvrIY
+						rYlU/r0ghRYAh6z9BeCiX1Ujx3vI3tOdG85LiaxDFBeUGq+EGZPFilMDdzCWVm92
+						y1GE4I0lT1fVZ0QQxNMz0ensIzIeh4JTgd6lbXm/l2G/NqaN3KXQ81jaahhC6omh
+						/8B1yAFVgKaK/PrHQuSpm4+zA+Qe3iFHtQ/TY3Nn2Sp3f8b/kzN4z6QI
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ulster.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Test Unidesk - Ulster</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IS Apps Technology Management</GivenName>
+    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..b1151546
--- /dev/null
+++ b/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ulster.unidesk.ac.uk/tas/secure/login/verify">
+  <!--
+		This is a "Test Unidesk - Ulster" TOPdesk SP for University of Edinburgh.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:25:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID5jCCAs6gAwIBAgIJANq1yLjymVOIMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+						BAMTGXRlc3QudWxzdGVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QudWxz
+						dGVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzc1NFoX
+						DTI2MDMzMDEyMzc1NFowVTEiMCAGA1UEAxMZdGVzdC51bHN0ZXIudW5pZGVzay5h
+						Yy51azEiMCAGA1UEChMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azELMAkGA1UE
+						BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJI/GFDxsFAW+6
+						Ou5nagpAq1Qk5Fin2rFY9BB7RS6KLhJoSgMX7ssGNXP8HYzcISCVPNXzqbfoKvcv
+						7grqXAA4iuhDWgAvIgxehnByEuj1TsxPb33b1ajNYDolxjJEmU51klO7NnaPRwR6
+						JJvhvzd2FzDlF9JrycTM8XbPjsTfTPXwgKfUeuxdCqlpsOb8MFyM3izEzIZkx+6N
+						bpIE+KLQZgOSchYFSaHhLqu/9TBza/J95VShgaPwQTK/yOtwTO3gX8oyOCOHzypy
+						KK8FylnsXQCp4EO6pNuN4b4VSp6OsrKdGKRU9oUamnR7qPzj4v8M+B6XU4mzMR3e
+						Z+ZbXFxPAgMBAAGjgbgwgbUwHQYDVR0OBBYEFEe6QHlpPV401yTQq07DeOkTcAw2
+						MIGFBgNVHSMEfjB8gBRHukB5aT1eNNck0KtOw3jpE3AMNqFZpFcwVTEiMCAGA1UE
+						AxMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC51bHN0
+						ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQDatci48plTiDAMBgNVHRME
+						BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCG0pO2+nYPsZIECStWimLJK0InGvkE
+						0AM+t6qX2+6A+eRyL6Uv6weUtM3XHXC/evNV7oy7/B8fBGHxBPpHohawBS+3EH9N
+						+TbyynfcetgpdVQJbfi5NEigG8kcakpjAKRykwjul1UdfRATEKxdwlvcrSTUZvt9
+						u21ITIDtIC6E/oRS+2PWP5XHwoebHcFvh1uAoWUscez4FFA2PK3rUpjDR7GhIQ80
+						+aFxEUr85lO9e25/1WlMNlQQCkzOHRSBKR2GXeqrfTUqeI3Ez5kumWYrmxiyXCDU
+						76p9XQ/DN7/gOwewXYHVMmZTvRGfEeicsqCUwVFEV705uNkc9jvhifo3
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID5jCCAs6gAwIBAgIJANq1yLjymVOIMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+						BAMTGXRlc3QudWxzdGVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QudWxz
+						dGVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzc1NFoX
+						DTI2MDMzMDEyMzc1NFowVTEiMCAGA1UEAxMZdGVzdC51bHN0ZXIudW5pZGVzay5h
+						Yy51azEiMCAGA1UEChMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azELMAkGA1UE
+						BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJI/GFDxsFAW+6
+						Ou5nagpAq1Qk5Fin2rFY9BB7RS6KLhJoSgMX7ssGNXP8HYzcISCVPNXzqbfoKvcv
+						7grqXAA4iuhDWgAvIgxehnByEuj1TsxPb33b1ajNYDolxjJEmU51klO7NnaPRwR6
+						JJvhvzd2FzDlF9JrycTM8XbPjsTfTPXwgKfUeuxdCqlpsOb8MFyM3izEzIZkx+6N
+						bpIE+KLQZgOSchYFSaHhLqu/9TBza/J95VShgaPwQTK/yOtwTO3gX8oyOCOHzypy
+						KK8FylnsXQCp4EO6pNuN4b4VSp6OsrKdGKRU9oUamnR7qPzj4v8M+B6XU4mzMR3e
+						Z+ZbXFxPAgMBAAGjgbgwgbUwHQYDVR0OBBYEFEe6QHlpPV401yTQq07DeOkTcAw2
+						MIGFBgNVHSMEfjB8gBRHukB5aT1eNNck0KtOw3jpE3AMNqFZpFcwVTEiMCAGA1UE
+						AxMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC51bHN0
+						ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQDatci48plTiDAMBgNVHRME
+						BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCG0pO2+nYPsZIECStWimLJK0InGvkE
+						0AM+t6qX2+6A+eRyL6Uv6weUtM3XHXC/evNV7oy7/B8fBGHxBPpHohawBS+3EH9N
+						+TbyynfcetgpdVQJbfi5NEigG8kcakpjAKRykwjul1UdfRATEKxdwlvcrSTUZvt9
+						u21ITIDtIC6E/oRS+2PWP5XHwoebHcFvh1uAoWUscez4FFA2PK3rUpjDR7GhIQ80
+						+aFxEUr85lO9e25/1WlMNlQQCkzOHRSBKR2GXeqrfTUqeI3Ez5kumWYrmxiyXCDU
+						76p9XQ/DN7/gOwewXYHVMmZTvRGfEeicsqCUwVFEV705uNkc9jvhifo3
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ulster.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Test Unidesk - Ulster</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IS Apps Technology Management</GivenName>
+    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testbed.tier.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/testbed.tier.internet2.edu-shibboleth.xml
new file mode 100644
index 00000000..0b87ad3e
--- /dev/null
+++ b/swamid-interfederations-2.0/testbed.tier.internet2.edu-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://testbed.tier.internet2.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://testbed.tier.internet2.edu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">TIER Testbed</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDVjCCAj4CCQCxK8dYunQUsjANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJV
+UzERMA8GA1UECAwITWljaGlnYW4xEjAQBgNVBAcMCUFubiBBcmJvcjESMBAGA1UE
+CgwJSW50ZXJuZXQyMSMwIQYDVQQDDBp0ZXN0YmVkLnRpZXIuaW50ZXJuZXQyLmVk
+dTAeFw0xNjAzMjExODM4NTlaFw0yNjAzMTkxODM4NTlaMG0xCzAJBgNVBAYTAlVT
+MREwDwYDVQQIDAhNaWNoaWdhbjESMBAGA1UEBwwJQW5uIEFyYm9yMRIwEAYDVQQK
+DAlJbnRlcm5ldDIxIzAhBgNVBAMMGnRlc3RiZWQudGllci5pbnRlcm5ldDIuZWR1
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvu2gbbW1ieYyKqdk5Twp
+uQIxTJ9UpZ2OQaZRaPUv0C63UcOYi8TuHmf5RN9wmJZ8oUimWaX1uzHGOvg2xU/a
+coWk05VUwcCXhC1GnQmAy4AmHgXmRprRkojzwrGAIsQFfKqctuHnIEr8Q9+fxS/Y
+BRO8/KwyZDu52K2BZX6gBZGv9NsF1khGjLvXqrXq+XuJI1uoAvOsZ94C1l0zPPnS
+Yg8YBOIJjf4dROzqxTr67prdFayixLAdPPLOgdNIcT22hHdsvqCAC+vOa5X08cLF
+akj7kjV1Hk1WTz2SCpzworCI8Rt04zmRZnOMqN/Ip1Y0qrptMkul/V7E9aX+y/g0
+oQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAPJ7+ryXzAcG3iXZUESHk6cSYDddw8
+L0/j3v8QB/8O2x8NGMpB+kzn3zWaE+wrDBSvenyewFGWt+zyWz0OGI73oGSUDzu3
+x+7qi9L8TPsPefm5sCYu5K4LvaXSARP157S2iYN+1aaFwFmITkenaINiKUkw8Ggm
+TMirq1O+wkTTt16SND5W54/qCDu3nsk6EL++D5QLyDFHzcksXG84vUHajnhsjVph
+iDF+FXy/yDzafEk3UNjrsFZucB2b+2E6jw4zykVDDWDFD1f5scTM/7AVG5j8iSdQ
+5sCWp8xNzxsYu/ZpKMHIIvF0t84XclaWe2BPIm9RvbZfHYrrjTqrB+kE
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testbed.tier.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testbed.tier.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testbed.tier.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testbed.tier.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James Jokl</md:GivenName>
+    <md:EmailAddress>jaj@virginia.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>James Jokl</md:GivenName>
+    <md:EmailAddress>jaj@virginia.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James Jokl</md:GivenName>
+    <md:EmailAddress>jaj@virginia.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>James Jokl</md:GivenName>
+    <md:EmailAddress>jaj@virginia.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testshib.msacademicverify.com-shibboleth-sp.xml b/swamid-interfederations-2.0/testshib.msacademicverify.com-shibboleth-sp.xml
index a0b55e77..d7231c7b 100644
--- a/swamid-interfederations-2.0/testshib.msacademicverify.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/testshib.msacademicverify.com-shibboleth-sp.xml
@@ -27,35 +27,31 @@
       <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://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:Description xml:lang="en">Microsoft uses the Academic Verification Engine (AVE) to determine client academic eligibility</mdui:Description>
       </mdui:UIInfo>
     </Extensions>
     <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==
+						MIIDPTCCAiWgAwIBAgIJAJrH6geQXck0MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+						BAMTHXRlc3RzaGliLm1zYWNhZGVtaWN2ZXJpZnkuY29tMB4XDTE2MDMxMTE5NDIz
+						M1oXDTIxMDMxMDE5NDIzM1owKDEmMCQGA1UEAxMddGVzdHNoaWIubXNhY2FkZW1p
+						Y3ZlcmlmeS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD0+lw1
+						ZhFsxvxo4CQJkmp+fBbSuLYrK/kTaXGrI8Ih6kGpWLJHDIiIVa1IQ4ZekHV0uaLx
+						3VuI9G47ldGsM22trPEAeFJkevQEaHrEbBKx4smf0VCK7l77cod+V3n+ZcIGraV/
+						PdsyFQcxl6ou9iOpy6iuHPDHPmWD+UbK+7jXqjdwTl05Z15/qjFdd0X1GQLtoNCb
+						gpC6MmA5kh4qq17LCjxcBvcMOoOyy74EIKC1V3+ARYPI+ZlR+5B3dKHdFm1t3e3W
+						HuKMd3kF/aYBT0bT7PkQ5milbNn7wyEqDvFHknp6tMgMScjuNSA/ubR0HOmokIC0
+						5nIsC5ZHyfScCI75AgMBAAGjajBoMEcGA1UdEQRAMD6CHXRlc3RzaGliLm1zYWNh
+						ZGVtaWN2ZXJpZnkuY29thh10ZXN0c2hpYi5tc2FjYWRlbWljdmVyaWZ5LmNvbTAd
+						BgNVHQ4EFgQULkp8EX6IrZIgFg/tkmQkbCNAHIowDQYJKoZIhvcNAQEFBQADggEB
+						AGtNVbxzvCmDP1TEjQ3t5eCmtu8Pfu20+m7IeE/hFFQkA5Tq7pkTdSFold0goMag
+						OTZLot6LYFDFdu6UHy+RUOs+J86RskGyxGy1YlcYUWs0MiCMZvdDxQtoXDVAirP9
+						zqNZ/+ijoxFcTbCFZJH0MMIansOr4mn2voduOg6JIKh4jKUF36X9KbJSkzRx0mu5
+						N040M5wlbwo4OiPAltFmhPbIF2ipcPaOK5Zpz+jyA5x33QFSmDILykP9e7q08j0F
+						gn8j5J+iK6w5feOilz/dDL66zitxLhOm2IKF5tw7Z7dHShic3JR9qZ9rj3oBfn5j
+						7ioqQaver65PjgkNAMUtvRM=
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/trshibtest.falmouth.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/trshibtest.falmouth.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..7528dc66
--- /dev/null
+++ b/swamid-interfederations-2.0/trshibtest.falmouth.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://trshibtest.falmouth.ac.uk/idp/shibboleth">
+  <!--
+		This is a test Shibboleth IdP for Falmouth University.
+	-->
+  <Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-24T16:06:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">falmouth.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fxplus.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Falmouth University TEST</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Falmouth University &amp; FXPlus IdP</mdui:Description>
+        <mdui:Logo height="80" width="80">https://trshibtest.falmouth.ac.uk/idp/images/falmouth-university-logo-print.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUDCCAjigAwIBAgIVALdJ0CbH8jcGy4tEynFSTk1hpgN0MA0GCSqGSIb3DQEB
+						CwUAMCQxIjAgBgNVBAMMGXRyc2hpYnRlc3QuZmFsbW91dGguYWMudWswHhcNMTYw
+						MzEwMTQxMjM3WhcNMzYwMzEwMTQxMjM3WjAkMSIwIAYDVQQDDBl0cnNoaWJ0ZXN0
+						LmZhbG1vdXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						lFSN9874S8OSMzLJWs7ysZiQeyUhHBLpR3dRvTM6VmpP/r5k+pLdR/xCcjwMIP2v
+						sBDufMMHlbaFIZErS6J5mtlOmU2yYVsa3wvGqnMV0doX/LRPoYKKSJxIBgBoCx63
+						LXAS6l/ZBNuB8JjLYP9WEGda5JWNxE4iwFfFjcpLsqNljzcDHGzWzNC8tErKRZcz
+						Hj0ZgIfecO7gAQIdRKPo47qJ/ut4q9bplk+7MzfWJ8e3qQLetXw8yxlCse2johOy
+						DWNw7uduEwg7mQncUUTdO/m5VHwm0UGhozMf1bw837fdX0IZjGzZ5noQ3TfrDSQg
+						MImungTTMnMB4o9duqEV9QIDAQABo3kwdzAdBgNVHQ4EFgQUvUB+7I6pLrZfc0Xa
+						ozHOnzMbiCQwVgYDVR0RBE8wTYIZdHJzaGlidGVzdC5mYWxtb3V0aC5hYy51a4Yw
+						aHR0cHM6Ly90cnNoaWJ0ZXN0LmZhbG1vdXRoLmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MA0GCSqGSIb3DQEBCwUAA4IBAQAqhAE9QU4GG1vQUGbQaBFiggrrNQPaSe+J2dTg
+						7YieVe3dOf5AqcbYdMmFXuUvKGQoXRDlnvbDQDxRi9dtUsADFnc8/UtWF/eMSu/X
+						BOnhH2rdhvLFuxW2avNf8YAXxtqqp5GA+vwNl2/Gv2TtfSpDeXrIdcIQpO0gbTXK
+						UE1hJDOyv92s8yVzYOv9aHgdoT1AAy884K7ymWByZ6v05kAnfwqcuMxm8uG1yP08
+						ujQvJ+CUe/bMSrQNl4U/Z4DuRckI6qDvPfKyRR9hTRHS7uTksPODDyB/gykaLY0N
+						vl+qFY7UB/E826CYYavCmzHYeMyzopHS/uFOIJ/fNLcmnzde
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDTzCCAjegAwIBAgIUWuDfmWMXBDc8mOCon5/2pM7qoT4wDQYJKoZIhvcNAQEL
+						BQAwJDEiMCAGA1UEAwwZdHJzaGlidGVzdC5mYWxtb3V0aC5hYy51azAeFw0xNjAz
+						MTAxNDEyMzVaFw0zNjAzMTAxNDEyMzVaMCQxIjAgBgNVBAMMGXRyc2hpYnRlc3Qu
+						ZmFsbW91dGguYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/
+						E+yAVkaXGCNuAzBkcNpezmHDV7SCZDRMIFwqCP6CMVGhoIf1maeIIuoiMFJeFyzT
+						XdARJ8WhFMZNJuOypFhMVrJKlM5nj9D4a8f4kaWYF4Nr0tV3TawypIPiJtTI+6Mo
+						EDeXMUQKfZRPcSDBeFDt03ZitnUG7fWPXcz0SPsGnLF9ZJUBxffvYTBy2luz8AKm
+						yCmqpGWzq/xfEjebm9LswCy3pOpOysi2jHNeoNeE2zJLKPPTF3o5XSAF50kfch9F
+						L/E5K+m6JJg/yiqZtrE44mDeVfxa+bAiTp8VN5cwBNneEHrmsuy++BSDE6s0l+DC
+						sZ8zHPU6xOsAfhPNVeZfAgMBAAGjeTB3MB0GA1UdDgQWBBQaPhDpAKZ+3Kd7kghO
+						0yh3mz4aPzBWBgNVHREETzBNghl0cnNoaWJ0ZXN0LmZhbG1vdXRoLmFjLnVrhjBo
+						dHRwczovL3Ryc2hpYnRlc3QuZmFsbW91dGguYWMudWsvaWRwL3NoaWJib2xldGgw
+						DQYJKoZIhvcNAQELBQADggEBAFMjx8Bg8/pd58cM0YXtTjYSHGZ8kNd6qnhcvkyo
+						o0NS5SDV5HyLlJG8sd8BdIk0hdNzwE02XYMTDx4OoeIx/ZbTk0MonmMwpT7JC4FL
+						HR0ApR+fSTIO4kFwFzouBic3toTADwOTJN7YDVSUqlBmdWSj/nv5OktoZ0BXFFOu
+						NHAz1et2Sup1z94vnjXsXmgNTVFpLKOwc8H6PL/5pZG4YT8AtRDGksrP/Y+cDGW6
+						saksfTnCQPJU28XqHdACWHj+CTeaYAR9JKJaZ24XWLldkCQiXovKlmxE16vODXu5
+						37GKjHMDpAns/LBj4zx6eud3JEdSfrMQEsgkkmAM5sVDVco=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDTzCCAjegAwIBAgIUOJdFt95kXi6uUBnJeB0Fd94jY/swDQYJKoZIhvcNAQEL
+						BQAwJDEiMCAGA1UEAwwZdHJzaGlidGVzdC5mYWxtb3V0aC5hYy51azAeFw0xNjAz
+						MTAxNDEyMzdaFw0zNjAzMTAxNDEyMzdaMCQxIjAgBgNVBAMMGXRyc2hpYnRlc3Qu
+						ZmFsbW91dGguYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb
+						T6lWMDfvSczfDYobj5gQg4KcxRifWJ3RPnpjH38+mjXlvfo8IzXoMTPMs1Q0wE4e
+						4+mrdr2fttn7dgRq2o5PqiVxmSCkBOLJGdK0cQcUqBb7x6FuXsKaKOA5S7Szs4ic
+						XpRrTUlitb9IdhwMC9BcOXZQp4FiUjXDL/hHNC7oaeiuH2tFSSwxcvwdW+Y8V49k
+						rwfU8ueKOKjZAU2XaXEnau0gwIDQFXdwlJdRJyl7FS8GSvkHWYPJjU+YjJ7DQuuu
+						GbqaKCsHggHvAWo0Qcx/IrY83WaJYk6BaXQs7za8yZlo9KY3e2ml0YykvPOy7qeJ
+						O73kzqYBOHsKk5SjGr6hAgMBAAGjeTB3MB0GA1UdDgQWBBQUfIxB/R8h/5yz3TBV
+						gvCuv2LyITBWBgNVHREETzBNghl0cnNoaWJ0ZXN0LmZhbG1vdXRoLmFjLnVrhjBo
+						dHRwczovL3Ryc2hpYnRlc3QuZmFsbW91dGguYWMudWsvaWRwL3NoaWJib2xldGgw
+						DQYJKoZIhvcNAQELBQADggEBACxE4iIeeH8WuVinotJ9ItZRNm5zOhINEugfUMgP
+						8JXPqIK6ntJUYcLJJQP63D3WsZqL6beVmClBgBxUcs6HLKPRBvrBSVLrEYts3MvM
+						qLBur61WOs9Z/AKNR9P+1Xxuvv7kILdLx97sGnS+r+fOw+QkgFYliyRS0qbf0Qxk
+						kLhMKS6/1k0Uvu/CJj3eYgGB7R8LC4dY6fiMZI0ir5uHmjYflBvA0NBcUZROblB3
+						Dl2BP3JG3+9en6C43qFntSFWA5NMQKQtg5wb5WF2zkWzDjCVfHUEp31PvxrUGEa+
+						xmGxr0bsY8u5lgCP2Mg6iYcXdwNwHXU7vSAmyCNIJmSOn9k=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://trshibtest.falmouth.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">falmouth.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fxplus.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUDCCAjigAwIBAgIVALdJ0CbH8jcGy4tEynFSTk1hpgN0MA0GCSqGSIb3DQEB
+						CwUAMCQxIjAgBgNVBAMMGXRyc2hpYnRlc3QuZmFsbW91dGguYWMudWswHhcNMTYw
+						MzEwMTQxMjM3WhcNMzYwMzEwMTQxMjM3WjAkMSIwIAYDVQQDDBl0cnNoaWJ0ZXN0
+						LmZhbG1vdXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						lFSN9874S8OSMzLJWs7ysZiQeyUhHBLpR3dRvTM6VmpP/r5k+pLdR/xCcjwMIP2v
+						sBDufMMHlbaFIZErS6J5mtlOmU2yYVsa3wvGqnMV0doX/LRPoYKKSJxIBgBoCx63
+						LXAS6l/ZBNuB8JjLYP9WEGda5JWNxE4iwFfFjcpLsqNljzcDHGzWzNC8tErKRZcz
+						Hj0ZgIfecO7gAQIdRKPo47qJ/ut4q9bplk+7MzfWJ8e3qQLetXw8yxlCse2johOy
+						DWNw7uduEwg7mQncUUTdO/m5VHwm0UGhozMf1bw837fdX0IZjGzZ5noQ3TfrDSQg
+						MImungTTMnMB4o9duqEV9QIDAQABo3kwdzAdBgNVHQ4EFgQUvUB+7I6pLrZfc0Xa
+						ozHOnzMbiCQwVgYDVR0RBE8wTYIZdHJzaGlidGVzdC5mYWxtb3V0aC5hYy51a4Yw
+						aHR0cHM6Ly90cnNoaWJ0ZXN0LmZhbG1vdXRoLmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MA0GCSqGSIb3DQEBCwUAA4IBAQAqhAE9QU4GG1vQUGbQaBFiggrrNQPaSe+J2dTg
+						7YieVe3dOf5AqcbYdMmFXuUvKGQoXRDlnvbDQDxRi9dtUsADFnc8/UtWF/eMSu/X
+						BOnhH2rdhvLFuxW2avNf8YAXxtqqp5GA+vwNl2/Gv2TtfSpDeXrIdcIQpO0gbTXK
+						UE1hJDOyv92s8yVzYOv9aHgdoT1AAy884K7ymWByZ6v05kAnfwqcuMxm8uG1yP08
+						ujQvJ+CUe/bMSrQNl4U/Z4DuRckI6qDvPfKyRR9hTRHS7uTksPODDyB/gykaLY0N
+						vl+qFY7UB/E826CYYavCmzHYeMyzopHS/uFOIJ/fNLcmnzde
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDTzCCAjegAwIBAgIUWuDfmWMXBDc8mOCon5/2pM7qoT4wDQYJKoZIhvcNAQEL
+						BQAwJDEiMCAGA1UEAwwZdHJzaGlidGVzdC5mYWxtb3V0aC5hYy51azAeFw0xNjAz
+						MTAxNDEyMzVaFw0zNjAzMTAxNDEyMzVaMCQxIjAgBgNVBAMMGXRyc2hpYnRlc3Qu
+						ZmFsbW91dGguYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/
+						E+yAVkaXGCNuAzBkcNpezmHDV7SCZDRMIFwqCP6CMVGhoIf1maeIIuoiMFJeFyzT
+						XdARJ8WhFMZNJuOypFhMVrJKlM5nj9D4a8f4kaWYF4Nr0tV3TawypIPiJtTI+6Mo
+						EDeXMUQKfZRPcSDBeFDt03ZitnUG7fWPXcz0SPsGnLF9ZJUBxffvYTBy2luz8AKm
+						yCmqpGWzq/xfEjebm9LswCy3pOpOysi2jHNeoNeE2zJLKPPTF3o5XSAF50kfch9F
+						L/E5K+m6JJg/yiqZtrE44mDeVfxa+bAiTp8VN5cwBNneEHrmsuy++BSDE6s0l+DC
+						sZ8zHPU6xOsAfhPNVeZfAgMBAAGjeTB3MB0GA1UdDgQWBBQaPhDpAKZ+3Kd7kghO
+						0yh3mz4aPzBWBgNVHREETzBNghl0cnNoaWJ0ZXN0LmZhbG1vdXRoLmFjLnVrhjBo
+						dHRwczovL3Ryc2hpYnRlc3QuZmFsbW91dGguYWMudWsvaWRwL3NoaWJib2xldGgw
+						DQYJKoZIhvcNAQELBQADggEBAFMjx8Bg8/pd58cM0YXtTjYSHGZ8kNd6qnhcvkyo
+						o0NS5SDV5HyLlJG8sd8BdIk0hdNzwE02XYMTDx4OoeIx/ZbTk0MonmMwpT7JC4FL
+						HR0ApR+fSTIO4kFwFzouBic3toTADwOTJN7YDVSUqlBmdWSj/nv5OktoZ0BXFFOu
+						NHAz1et2Sup1z94vnjXsXmgNTVFpLKOwc8H6PL/5pZG4YT8AtRDGksrP/Y+cDGW6
+						saksfTnCQPJU28XqHdACWHj+CTeaYAR9JKJaZ24XWLldkCQiXovKlmxE16vODXu5
+						37GKjHMDpAns/LBj4zx6eud3JEdSfrMQEsgkkmAM5sVDVco=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDTzCCAjegAwIBAgIUOJdFt95kXi6uUBnJeB0Fd94jY/swDQYJKoZIhvcNAQEL
+						BQAwJDEiMCAGA1UEAwwZdHJzaGlidGVzdC5mYWxtb3V0aC5hYy51azAeFw0xNjAz
+						MTAxNDEyMzdaFw0zNjAzMTAxNDEyMzdaMCQxIjAgBgNVBAMMGXRyc2hpYnRlc3Qu
+						ZmFsbW91dGguYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb
+						T6lWMDfvSczfDYobj5gQg4KcxRifWJ3RPnpjH38+mjXlvfo8IzXoMTPMs1Q0wE4e
+						4+mrdr2fttn7dgRq2o5PqiVxmSCkBOLJGdK0cQcUqBb7x6FuXsKaKOA5S7Szs4ic
+						XpRrTUlitb9IdhwMC9BcOXZQp4FiUjXDL/hHNC7oaeiuH2tFSSwxcvwdW+Y8V49k
+						rwfU8ueKOKjZAU2XaXEnau0gwIDQFXdwlJdRJyl7FS8GSvkHWYPJjU+YjJ7DQuuu
+						GbqaKCsHggHvAWo0Qcx/IrY83WaJYk6BaXQs7za8yZlo9KY3e2ml0YykvPOy7qeJ
+						O73kzqYBOHsKk5SjGr6hAgMBAAGjeTB3MB0GA1UdDgQWBBQUfIxB/R8h/5yz3TBV
+						gvCuv2LyITBWBgNVHREETzBNghl0cnNoaWJ0ZXN0LmZhbG1vdXRoLmFjLnVrhjBo
+						dHRwczovL3Ryc2hpYnRlc3QuZmFsbW91dGguYWMudWsvaWRwL3NoaWJib2xldGgw
+						DQYJKoZIhvcNAQELBQADggEBACxE4iIeeH8WuVinotJ9ItZRNm5zOhINEugfUMgP
+						8JXPqIK6ntJUYcLJJQP63D3WsZqL6beVmClBgBxUcs6HLKPRBvrBSVLrEYts3MvM
+						qLBur61WOs9Z/AKNR9P+1Xxuvv7kILdLx97sGnS+r+fOw+QkgFYliyRS0qbf0Qxk
+						kLhMKS6/1k0Uvu/CJj3eYgGB7R8LC4dY6fiMZI0ir5uHmjYflBvA0NBcUZROblB3
+						Dl2BP3JG3+9en6C43qFntSFWA5NMQKQtg5wb5WF2zkWzDjCVfHUEp31PvxrUGEa+
+						xmGxr0bsY8u5lgCP2Mg6iYcXdwNwHXU7vSAmyCNIJmSOn9k=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Falmouth University</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Falmouth University TEST</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.falmouth.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Steve</GivenName>
+    <SurName>Pellow</SurName>
+    <EmailAddress>mailto:steve.pellow@fxplus.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Steve</GivenName>
+    <SurName>Pellow</SurName>
+    <EmailAddress>mailto:steve.pellow@fxplus.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml
index 2bac5ee5..d58e3e78 100644
--- a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml
+++ b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml
@@ -11,7 +11,7 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Statistical Accounts of Scotland</mdui:DisplayName>
         <mdui:Description xml:lang="en">Essential sources of the study of Scottish life in the 18th and 19th centuries</mdui:Description>
-        <mdui:Logo height="119" width="350">https://vsp2.edina.ac.uk/public/images/splogos/statacc.png</mdui:Logo>
+        <mdui:Logo height="119" width="350">https://auth.edina.ac.uk/public/images/splogos/statacc.png</mdui:Logo>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml
index 9e334976..45ff75f2 100644
--- a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml
+++ b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml
@@ -9,7 +9,7 @@
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
     <Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="65" width="150">https://vsp2.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
+        <mdui:Logo height="65" width="150">https://auth.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
         <mdui:DisplayName xml:lang="en">EDINA services</mdui:DisplayName>
         <mdui:Description xml:lang="en">EDINA services for research and education</mdui:Description>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml
index 8e556d93..1a0ac0c9 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml
@@ -8,8 +8,8 @@
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhb.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes2.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-haute-bretagne.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes2.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Université Rennes 2</mdui:DisplayName>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB6UlEQVQoz1WST0iUURTFf/fNlzCpWSA0EQYSYgz9cRUWNut2QdG+drWR2rizqFW0KGaVyZAGQVCGChVEm8wpgiJiQhTCFlIEYWU2g86/d1q870u7m/d4vHPPPeceY9wAJDMTGIhwAjJMiLgMcBbfTQgv+eSDMEtJoR0IvEARwpA81DmU6euI2ufK8z9WlmkBNQNjT2tPJr0zZe7F95dwF25zcfZCXTUltVRZ2veglwKMpSjwcG4ivDOCo8H57LkbAzcjtqDATdfWrvnTCwd39OGbQM1XExk46lzrv56osqAsqHh9oohjQ3MA7O3s3ha1g/40VoeKQ8ce56YXpwy8fGuq9dXxIuv/ATgyfTjMd+b5WUbhDoxw+e0lSfJe0uDsYOF9YUODNxeQ2c4sDWhCmivvrk59nsQMyA/kD2T2b6K4hyTvvaSZbzOPFiYowDiM8rXyRZLXPzJxC0eF0s+PYc25TO5k7ylqmCBi92T3mtbD7s0Udu1oof/Z0dX6b9vknMxwjlp9z/1dlWbFsCQsOMzWquWOse3Db4afLj0p/SqRAmTyuNRydaVtrC3/Ib9Y/hTnhXEMk0QTPBgWIbPEfwc+NsNjaYuSEVFkIZ7EmTUkzIMjEpFMJnDCUBzsgFCcVwVbTd4ww0Kbv2lsB+BFv9iTAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA1KzAyOjAwu5sZmwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMMrGoScAAAAASUVORK5CYII=</mdui:Logo>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml
index 9ca1e256..e81757cd 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml
@@ -7,8 +7,8 @@
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth: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-poitiers.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.univ-poitiers.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-poitiers.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Université de Poitiers</mdui:DisplayName>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB50lEQVQ4y52ST0tUURjGf+/5c++YFGMxKZhWy2zhJmyTtIoiiPat2gQS2KJFBX2CAvETBBK0qqBFBEFNBEUMuDOKFgmFGdiMcXVGvePc87aYSb1KZL2bA+c8z+/9d+T+nRvXjMgE4NhliABKmsGYMSITIrJrM4AqiEhs0EkHOFVlPV0lZNkOsfURWasJunlnrMXHXYAUHMB6usr5y9cp9Q/SaqYoICL4KOZ95TVDJ04RQkYIAec81e9zPJuaxMcFdQDWRcy8K7O3uJ+RMxcBqCc/mS4/pTr/laS6wNDIKD2lPr7NfuLj9Bus9/B7cMZa5j9/YK2xxPGTp+neV2wLK2WiQje1+S/UkxpnL43x6uE9Qsiwrg0wW/uyPuqMGMQYrIs6p0ekLW2bN2du+MeQToL/BmyPHQD5o1T/DhAga7U2StUNk+J8DECrmebS5AHGkixWASge6KW52qDVTFlrLHP42DAr9aUdFeS+sPMRleePOHT1NqX+QS5cuUVSW6Cn1EfvwFHKj6dwUZxv+cHdm7q1u5C1dzw8eo6DA0dwPqaeLDLz9gU/5ma3A9ZcQNeNGK8djLGWEDKmXz5BQ4aqImKw3ufMxggadMVYkXFUV7buV0RwPsLHXUSFPfi4gDE2965BlzUw/gtzXK+1ooP+ugAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMLubGZsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDUrMDI6MDDKxqEnAAAAAElFTkSuQmCC</mdui:Logo>
diff --git a/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml b/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml
deleted file mode 100644
index 82d8fe9b..00000000
--- a/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:eduserv.org.uk:athens:provider:tvu.ac.uk">
-  <!--
-		This is a Shibboleth IdP for The University of West London.
-	-->
-  <Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tvu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEeDCCA2CgAwIBAgIRAJsjppl09pdBOodDFDJIICEwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MTUwMDAwMDBaFw0xNjA0MTQyMzU5NTlaMEMxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
-						aDIudHZ1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsrIB
-						oRzm965a3jJw5ZtnlwkDPOsdRsqpINAO0wK1l7dgCNkCyXHE83GA71wqtKa3n3/5
-						BVfPXd8uhWop/THWmUu/29VyMEJdo94ahl9KJ1IxkSFW/nDIsHTrQddZr/sjYNtw
-						jOohG/iDZve6LLhrdPxuiCgOcVCq32kg01/erwvpFJBgu4hsdFL0jrhn0mHPqc9N
-						RMXnRP7duAvWKPH6cTUKeCkCYhanYZemZoEhsFPUP+ahQOraZnSHVa0zeUjIUPBC
-						VisVzGQjzG1nS5WRcIMaWhjsCeF/rVGhhbuV/rVIPbYfM7YlmJiIyL+zzzlQcORR
-						ZgrGz3ijeyCQZsY92wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-						SWsrN1dH6pDjue0wHQYDVR0OBBYEFMZZ7NSWwqtYB0te0FBz956PHQYmMA4GA1Ud
-						DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-						BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-						HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-						TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-						dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-						Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoMi50
-						dnUuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAYWCw70ie/vQUIFBceDxr6c5Pm9
-						5hTQStS6scyEX9j65f81CnzAzXhuwNqyYn8QbWMm4WV/j7RJhqE5sNNgEIoyAWWt
-						LG+XOuDCTuHEcwMgsoMq6ESPDBkuVSxxrX4YeyI3ssGKAOkpMqhsxrfLDkIwE4/r
-						VxxkimAI4E7GnN7RJDykAo4pczr1VqyMxVACEW561CFxcp2PNFs9m0fM16tkla4f
-						fytNoHcf/mcJWXaAAOkoDmCob0F8bJauUx9Ul4Nhsp8SyXpMQoKlxuxInHNU3nkJ
-						s4XBFY3CGcP1NizUMMo6uWkiqC68iprykMcar3qMC/h4aPCdWDmeS1BZPgo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.tvu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.tvu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.tvu.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.tvu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.tvu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.tvu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tvu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEeDCCA2CgAwIBAgIRAJsjppl09pdBOodDFDJIICEwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MTUwMDAwMDBaFw0xNjA0MTQyMzU5NTlaMEMxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
-						aDIudHZ1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsrIB
-						oRzm965a3jJw5ZtnlwkDPOsdRsqpINAO0wK1l7dgCNkCyXHE83GA71wqtKa3n3/5
-						BVfPXd8uhWop/THWmUu/29VyMEJdo94ahl9KJ1IxkSFW/nDIsHTrQddZr/sjYNtw
-						jOohG/iDZve6LLhrdPxuiCgOcVCq32kg01/erwvpFJBgu4hsdFL0jrhn0mHPqc9N
-						RMXnRP7duAvWKPH6cTUKeCkCYhanYZemZoEhsFPUP+ahQOraZnSHVa0zeUjIUPBC
-						VisVzGQjzG1nS5WRcIMaWhjsCeF/rVGhhbuV/rVIPbYfM7YlmJiIyL+zzzlQcORR
-						ZgrGz3ijeyCQZsY92wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-						SWsrN1dH6pDjue0wHQYDVR0OBBYEFMZZ7NSWwqtYB0te0FBz956PHQYmMA4GA1Ud
-						DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-						BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-						HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-						TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-						dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-						Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoMi50
-						dnUuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAYWCw70ie/vQUIFBceDxr6c5Pm9
-						5hTQStS6scyEX9j65f81CnzAzXhuwNqyYn8QbWMm4WV/j7RJhqE5sNNgEIoyAWWt
-						LG+XOuDCTuHEcwMgsoMq6ESPDBkuVSxxrX4YeyI3ssGKAOkpMqhsxrfLDkIwE4/r
-						VxxkimAI4E7GnN7RJDykAo4pczr1VqyMxVACEW561CFxcp2PNFs9m0fM16tkla4f
-						fytNoHcf/mcJWXaAAOkoDmCob0F8bJauUx9Ul4Nhsp8SyXpMQoKlxuxInHNU3nkJ
-						s4XBFY3CGcP1NizUMMo6uWkiqC68iprykMcar3qMC/h4aPCdWDmeS1BZPgo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.tvu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.tvu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of West London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of West London (Old)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.tvu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service Helpdesk</GivenName>
-    <EmailAddress>mailto:itservicedesk@uwl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Amanda</GivenName>
-    <SurName>Burns</SurName>
-    <EmailAddress>mailto:amanda.burns@uwl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Vani</GivenName>
-    <SurName>Aul</SurName>
-    <EmailAddress>mailto:Vani.Aul@uwl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Network Services</GivenName>
-    <EmailAddress>mailto:networkservices@uwl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Rumun</SurName>
-    <EmailAddress>mailto:richard.rumun@uwl.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml b/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
index 402c9fe9..5e1f68e0 100644
--- a/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
+++ b/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="true">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Language Analysis Portal (LAP)</mdui:DisplayName>
@@ -83,13 +83,13 @@ agXV7Nv0+lQImU1b6gHzmrZC8Th4SmH6dwj/xA6p</ds:X509Certificate>
       <md:ServiceDescription xml:lang="en">The portal provides an intuitive and easily accessible web interface to a
         centralized repository of a wide range of language technology tools, all installed on a high-performance
         computing cluster.</md:ServiceDescription>
-      <md:RequestedAttribute 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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml
deleted file mode 100644
index c30ae8cb..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:musc.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">musc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Medical University of South Carolina</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPjCCAiagAwIBAgIJAOhQxRwlMGgIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWJib2xldGgubXVzYy5lZHUwHhcNMTMwMTA0MDE1MTAwWhcNMjMwMTAy
-MDE1MTAwWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLm11c2MuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoW2hT67QlW+YDCrhhjCyIrRpwksNqBvJ
-tKgwDrnQwOyMmThDoQBhcgJUTiavZ6ZP7cC0HAE9+8ComDaUVIewyYWKsgZTp79Q
-9BbEMW/op/kqYVzlHzoC8LfjfyPuttTChXeVvA8zx3eat4LJZEgX2m0D9Tfh0Rco
-VekYx+3hp+xs7DW/jAvHkCeamhR2jLEWGvtMte4cnJclq+yaejytFN6rvXiMI2QA
-sG2+/+I+hvCP22/SS1b30yhszOV8zU80gV8Cq/uSp57PWJVDQ4Rje2Vw99MWvSvA
-os4A+iwRFH9AIfEtCgGmgpMKc1J7KzM9lN9f0Qvql+RSqvrxD9/CXwIDAQABo38w
-fTAdBgNVHQ4EFgQUOyBE+oZl6so/wzN6C1RDnonqZm0wTgYDVR0jBEcwRYAUOyBE
-+oZl6so/wzN6C1RDnonqZm2hIqQgMB4xHDAaBgNVBAMTE3NoaWJib2xldGgubXVz
-Yy5lZHWCCQDoUMUcJTBoCDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQBmpjbrRMp6XiFyr2+HnD20IKQ7u2A2C2eJAPdAcFZMKGPnEX88TTMxjAO+5+hS
-zLgCUsFvXOMKZF7ncadnocozN6+affODvWU0J1+aSw1xvyemH/QuGSpW77+gBOGl
-uHg/UNKWyAjCpgt2avXkBhjsGLiN8AWj7mGcw8HKHrK7+4BU8L9TWM9ddzfHySn/
-/PXn/XBpzUialyLgS28nAuDF+qgtEhzMaB5T3PkbAacEqzCelRyVocfqjuYinusk
-nlH50wO+ogWqYa7JYPF86r1Lz1FS/qCaWzDtQdf+ZYXvPrcIT5bcY9vQx8gkR1VG
-DxVIAjeM+koyHkSro/jWAJae
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">musc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPjCCAiagAwIBAgIJAOhQxRwlMGgIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWJib2xldGgubXVzYy5lZHUwHhcNMTMwMTA0MDE1MTAwWhcNMjMwMTAy
-MDE1MTAwWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLm11c2MuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoW2hT67QlW+YDCrhhjCyIrRpwksNqBvJ
-tKgwDrnQwOyMmThDoQBhcgJUTiavZ6ZP7cC0HAE9+8ComDaUVIewyYWKsgZTp79Q
-9BbEMW/op/kqYVzlHzoC8LfjfyPuttTChXeVvA8zx3eat4LJZEgX2m0D9Tfh0Rco
-VekYx+3hp+xs7DW/jAvHkCeamhR2jLEWGvtMte4cnJclq+yaejytFN6rvXiMI2QA
-sG2+/+I+hvCP22/SS1b30yhszOV8zU80gV8Cq/uSp57PWJVDQ4Rje2Vw99MWvSvA
-os4A+iwRFH9AIfEtCgGmgpMKc1J7KzM9lN9f0Qvql+RSqvrxD9/CXwIDAQABo38w
-fTAdBgNVHQ4EFgQUOyBE+oZl6so/wzN6C1RDnonqZm0wTgYDVR0jBEcwRYAUOyBE
-+oZl6so/wzN6C1RDnonqZm2hIqQgMB4xHDAaBgNVBAMTE3NoaWJib2xldGgubXVz
-Yy5lZHWCCQDoUMUcJTBoCDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQBmpjbrRMp6XiFyr2+HnD20IKQ7u2A2C2eJAPdAcFZMKGPnEX88TTMxjAO+5+hS
-zLgCUsFvXOMKZF7ncadnocozN6+affODvWU0J1+aSw1xvyemH/QuGSpW77+gBOGl
-uHg/UNKWyAjCpgt2avXkBhjsGLiN8AWj7mGcw8HKHrK7+4BU8L9TWM9ddzfHySn/
-/PXn/XBpzUialyLgS28nAuDF+qgtEhzMaB5T3PkbAacEqzCelRyVocfqjuYinusk
-nlH50wO+ogWqYa7JYPF86r1Lz1FS/qCaWzDtQdf+ZYXvPrcIT5bcY9vQx8gkR1VG
-DxVIAjeM+koyHkSro/jWAJae
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Medical University of South Carolina</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Medical University of South Carolina</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.musc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Richard Gadsden</md:GivenName>
-    <md:EmailAddress>gadsden@musc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Joshua Staples</md:GivenName>
-    <md:EmailAddress>staplesj@musc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Shibboleth IDP Group</md:GivenName>
-    <md:EmailAddress>shibidp@musc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-uiuc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-uiuc.edu.xml
index 77ed5bfe..1cad2c94 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-uiuc.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-uiuc.edu.xml
@@ -11,7 +11,7 @@
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://shibboleth.illinois.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:IDPSSODescriptor errorURL="https://answers.uillinois.edu/illinois/shibboleth-error-message" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">illinois.edu</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml
index 2263d916..5b72139d 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml
@@ -19,7 +19,7 @@
         <mdui:Description xml:lang="en">The University of Maryland, College Park is a public research university, the flagship campus of the University System of Maryland, and the original 1862 land-grant institution in the State.</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://www.umd.edu</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.nethics.umd.edu/aup/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="61" width="61" xml:lang="en">https://www.urhome.umd.edu/trademarks/marks/gr/webglobesm.gif</mdui:Logo>
+        <mdui:Logo height="115" width="115" xml:lang="en">https://www.urhome.umd.edu/trademarks/marks/gr/webglobelg.gif</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-vt.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-vt.edu.xml
index f64f4a4a..7d8c8509 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-vt.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-vt.edu.xml
@@ -22,7 +22,7 @@
         <mdui:DisplayName xml:lang="en">Virginia Polytechnic Institute and State University</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">http://www.vt.edu/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.vt.edu/about/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="40" width="230" xml:lang="en">https://www.branding.unirel.vt.edu/images/S_logo-virginia-tech.jpg</mdui:Logo>
+        <mdui:Logo height="28" width="160" xml:lang="en">https://www.assets.cms.vt.edu/images/vt_notag_onwhite160.gif</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/urn-urkund-shibboleth-sp.xml b/swamid-interfederations-2.0/urn-urkund-shibboleth-sp.xml
index c9207fae..e802b1ca 100644
--- a/swamid-interfederations-2.0/urn-urkund-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/urn-urkund-shibboleth-sp.xml
@@ -5,7 +5,7 @@
       <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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
diff --git a/swamid-interfederations-2.0/us.ready.kuali.co-shibboleth-sp.xml b/swamid-interfederations-2.0/us.ready.kuali.co-shibboleth-sp.xml
new file mode 100644
index 00000000..4171a508
--- /dev/null
+++ b/swamid-interfederations-2.0/us.ready.kuali.co-shibboleth-sp.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://us.ready.kuali.co/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Kuali Ready</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Kuali Ready: Continuity Planning Tool</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.kuali.co</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.kuali.co/privacy-policy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFWDCCBECgAwIBAgIQdSD51D2J/H68GiKuV9R+VzANBgkqhkiG9w0BAQsFADCB
+kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
+BAMTLUNPTU9ETyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
+QTAeFw0xNDEyMDMwMDAwMDBaFw0xNTEyMDMyMzU5NTlaMFYxITAfBgNVBAsTGERv
+bWFpbiBDb250cm9sIFZhbGlkYXRlZDEVMBMGA1UECxMMRXNzZW50aWFsU1NMMRow
+GAYDVQQDExF1cy5yZWFkeS5rdWFsaS5jbzCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAIaKNbx0XrJSRssWcfgt43SopI7oZyDgjVdebLGphIRiB0+5AWaa
+kfDMCgEOmYQsoSdbtpdtIXChiO6x1sGnbP83eCO7bfZXXcreoOtNBjwIqSwujwen
+HAHyUoPPPwzC3MK80Zd6DwSA8py/jzl3lo42zpM4qxx5ziZ+n91ygQEXZLCUQUi9
++U32WAGHR3FvS0ziHgbu/tuR6mBbGAaO18Tr4D+61VUe3tfrgbW+hsnhnsjYfae8
+cfmO4NCzK46Ydli6UsdcNsx8bJv0vDKhBmTXaW2pPc0wtzcxGmOsWAG1urH6zW/t
+fEWc97e9ZgAYStfoYDjtbN7LJ13gKjdAv2cCAwEAAaOCAeUwggHhMB8GA1UdIwQY
+MBaAFJCvajqUWgvYkOoSVnPfQ7Q6KNrnMB0GA1UdDgQWBBRDRSu3AHQGJP/m3ZZ8
+GUwIDKGfGjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
+BggrBgEFBQcDAQYIKwYBBQUHAwIwTwYDVR0gBEgwRjA6BgsrBgEEAbIxAQICBzAr
+MCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5jb21vZG8uY29tL0NQUzAIBgZn
+gQwBAgEwVAYDVR0fBE0wSzBJoEegRYZDaHR0cDovL2NybC5jb21vZG9jYS5jb20v
+Q09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNybDCBhQYI
+KwYBBQUHAQEEeTB3ME8GCCsGAQUFBzAChkNodHRwOi8vY3J0LmNvbW9kb2NhLmNv
+bS9DT01PRE9SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3J0MCQG
+CCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wMwYDVR0RBCwwKoIR
+dXMucmVhZHkua3VhbGkuY2+CFXd3dy51cy5yZWFkeS5rdWFsaS5jbzANBgkqhkiG
+9w0BAQsFAAOCAQEAEJx24eL3ZD2XB+ozeu8kScil7yS5UpqHrAr9FjXIJoKtGetG
+FoTgZhOaBcEPAV/Ck8lEafyyaeATPBprnp52v2MaXXKpsdfK5Ns30hXfDcksWLOZ
+FFT8c8VHCppH2mXkBC66PyKoI9iI6oF7v0D6LZJkCvYjQ6nMuyQ7KJyoKc0uoxuq
+BjeBl4P1r17InaZSLCwRPJkpU26qFUctBqe+eRBkiHcP8yA5SQe1pxJzmuvSIQxF
+gPmXUWIVQJomabMJXajnaW+N9aUgq2pkUFOWc/cyrPu4hCZ+3t1mYI53TCHZuT9j
+igrISDU4NE+WRFXYNimd2m6klDtRE3PVtwaPcQ==
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Kuali Ready</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Kuali Ready: Continuity Planning Tool</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kuali, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kuali, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.kuali.co/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kuali Ready Technical Support</md:GivenName>
+    <md:EmailAddress>ready-help@kuali.co</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/venturacollege.instructure.com-saml2.xml b/swamid-interfederations-2.0/venturacollege.instructure.com-saml2.xml
index d3e0af83..96ce5ff0 100644
--- a/swamid-interfederations-2.0/venturacollege.instructure.com-saml2.xml
+++ b/swamid-interfederations-2.0/venturacollege.instructure.com-saml2.xml
@@ -61,6 +61,12 @@ q4vYqxxY/6rFJhrCtnlLepSaxlXM
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://venturacollege.beta.instructure.com/login/saml" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://venturacollege.test.instructure.com/saml_consume" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://venturacollege.test.instructure.com/login/saml" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vcccd.instructure.com/saml_consume" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vcccd.instructure.com/login/saml" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vcccd.test.instructure.com/saml_consume" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vcccd.test.instructure.com/login/saml" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vcccd.beta.instructure.com/saml_consume" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vcccd.beta.instructure.com/login/saml" index="12"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">OEI - Ventura College - Canvas</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"/>
diff --git a/swamid-interfederations-2.0/vetucation.vu-wien.ac.at-shibboleth.xml b/swamid-interfederations-2.0/vetucation.vu-wien.ac.at-shibboleth.xml
index 8366c22e..90cca1a9 100644
--- a/swamid-interfederations-2.0/vetucation.vu-wien.ac.at-shibboleth.xml
+++ b/swamid-interfederations-2.0/vetucation.vu-wien.ac.at-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vetucation.vu-wien.ac.at/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vetucation.vu-wien.ac.at/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2015-12-18T18:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
@@ -40,8 +40,8 @@
         <mdui:InformationURL xml:lang="de">https://vetucation.vetmeduni.ac.at/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://vetucation.vetmeduni.ac.at/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.vetmeduni.ac.at/en/infos/vetucation-privacy-policy-shibboleth/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16">https://www.vetmeduni.ac.at/favicon.ico</mdui:Logo>
-        <mdui:Logo height="69" width="231">https://www.vetmeduni.ac.at/fileadmin/vetmed/img/logo.gif</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://www.vetmeduni.ac.at/favicon.ico</mdui:Logo>
+        <mdui:Logo width="231" height="69">https://www.vetmeduni.ac.at/fileadmin/vetmed/img/logo.gif</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -91,7 +91,7 @@ mPmdVWCZHlIbHEZLKp9V+fu71Q==
       <md:ServiceName xml:lang="de">Vetucation</md:ServiceName>
       <md:ServiceDescription xml:lang="en">Vetucation is the e-learning platform of the University of Veterinary Medicine Vienna. Its purpose is the management of teaching and learning contents and the support of face-to-face teaching with various online communication and collaboration tools.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="de">Vetucation ist die e-learning Plattform der Vetmeduni Vienna. Sie dient der Verwaltung von Lehr- und Lernmaterial und Unterstützung der Präsenzlehre mit Online Kommunikations- und Kollaborations-Tools.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="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 isRequired="true" FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
diff --git a/swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml b/swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml
index 42d4dd1c..48a5bdcd 100644
--- a/swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml
@@ -37,37 +37,37 @@ LlmjJm9hYPxJyxlhjchh/4tGprdMSlHa+v8xlw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vho.aaf.edu.au:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1" isDefault="false"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vho.aaf.edu.au:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2" isDefault="false"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:ArtifactResolutionService index="2" isDefault="false" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vho.aaf.edu.au:8443/idp/profile/SAML2/SOAP/ArtifactResolution"/>
+    <md:ArtifactResolutionService index="1" isDefault="false" Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vho.aaf.edu.au:8443/idp/profile/SAML1/SOAP/ArtifactResolution"/>
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vho.aaf.edu.au/idp/profile/SAML2/POST-SimpleSign/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vho.aaf.edu.au/idp/profile/SAML2/POST/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vho.aaf.edu.au/idp/profile/SAML2/Redirect/SSO"/>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vho.aaf.edu.au/idp/profile/Shibboleth/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vho.aaf.edu.au/idp/profile/SAML2/SOAP/ECP"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="homeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="mobileNumber" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="organizationName" Name="urn:oid:2.5.4.10" 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="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="auEduPersonLegalName" Name="urn:oid:1.3.6.1.4.1.27856.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="homeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="auEduPersonSharedToken" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="auEduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.27856.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="organizationalUnit" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="eduPersonPrincipalName" Name="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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="email"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAssurance"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganizationType"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="surname"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonSharedToken"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonLegalName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganization"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationalUnit"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobileNumber"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="commonName"/>
   </md:IDPSSODescriptor>
   <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
@@ -97,32 +97,32 @@ LlmjJm9hYPxJyxlhjchh/4tGprdMSlHa+v8xlw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vho.aaf.edu.au:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vho.aaf.edu.au:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vho.aaf.edu.au:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="homeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="mobileNumber" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="organizationName" Name="urn:oid:2.5.4.10" 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="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="auEduPersonLegalName" Name="urn:oid:1.3.6.1.4.1.27856.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="homeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="auEduPersonSharedToken" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="auEduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.27856.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="organizationalUnit" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="eduPersonPrincipalName" Name="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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="email"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAssurance"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganizationType"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="surname"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonSharedToken"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonLegalName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganization"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationalUnit"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobileNumber"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="commonName"/>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">vho.aaf.edu.au</md:OrganizationName>
@@ -131,9 +131,9 @@ LlmjJm9hYPxJyxlhjchh/4tGprdMSlHa+v8xlw==</ds:X509Certificate>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:Company>Australian Access Federation</md:Company>
-    <md:GivenName>Bradley</md:GivenName>
-    <md:SurName>Beddoes</md:SurName>
-    <md:EmailAddress>mailto:b.beddoes@aaf.edu.au</md:EmailAddress>
+    <md:GivenName>AAF</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:support@aaf.edu.au</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>Australian Access Federation</md:Company>
@@ -144,8 +144,8 @@ LlmjJm9hYPxJyxlhjchh/4tGprdMSlHa+v8xlw==</ds:X509Certificate>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>Australian Access Federation</md:Company>
-    <md:GivenName>AAF</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:support@aaf.edu.au</md:EmailAddress>
+    <md:GivenName>Bradley</md:GivenName>
+    <md:SurName>Beddoes</md:SurName>
+    <md:EmailAddress>mailto:b.beddoes@aaf.edu.au</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml b/swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml
index 8c542edb..bebfc65f 100644
--- a/swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml
@@ -20,8 +20,8 @@
         <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:Logo xml:lang="sv" height="111" width="225">https://www.miun.se/imagevault/publishedmedia/x4bl7padufcm1j4td3d7/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="111" width="225">https://www.miun.se/imagevault/publishedmedia/x4bl7padufcm1j4td3d7/logo.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">http://www.miun.se/sv/Helpdesk/Student/MittNets-regler/</mdui:PrivacyStatementURL>
         <mdui:Keywords xml:lang="sv">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
         <mdui:Keywords xml:lang="en">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
diff --git a/swamid-interfederations-2.0/voparis-auth.obspm.fr-.xml b/swamid-interfederations-2.0/voparis-auth.obspm.fr-.xml
index e756806f..8f53cc33 100644
--- a/swamid-interfederations-2.0/voparis-auth.obspm.fr-.xml
+++ b/swamid-interfederations-2.0/voparis-auth.obspm.fr-.xml
@@ -81,8 +81,8 @@ UkePHzLUtvkC2YNySU+2LKUzZbyGxR3mXQ5mk/F0mrpk6Yn/frplA6nYGIWM7tb4
       <md:ServiceDescription xml:lang="fr">Accès au service authentifié de l'observatoire virtuel astronomique de l'Observatoire de Paris.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Access to authenticated service of the astronomical virtual observatory at Observatoire de Paris.</md:ServiceDescription>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" 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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
diff --git a/swamid-interfederations-2.0/vph3.crous-caen.fr.xml b/swamid-interfederations-2.0/vph3.crous-caen.fr.xml
index 68f854f1..8ef9efad 100644
--- a/swamid-interfederations-2.0/vph3.crous-caen.fr.xml
+++ b/swamid-interfederations-2.0/vph3.crous-caen.fr.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vph3.crous-caen.fr">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://vph3.crous-caen.fr">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-03-17T16:03:48Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-03-29T11:48:45Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -14,8 +14,8 @@
   <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">https://vph3.crous-caen.fr</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://vph3.crous-caen.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="en">http://vph3.crous-caen.fr</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://vph3.crous-caen.fr</mdui:InformationURL>
         <mdui:Description xml:lang="en">Plateforme Heberg3 Crous Caen Normandie</mdui:Description>
         <mdui:DisplayName xml:lang="fr">Plateforme Heberg3 du CROUS de Caen</mdui:DisplayName>
         <mdui:Description xml:lang="fr">Plateforme Heberg3 Crous Caen Normandie</mdui:Description>
@@ -77,18 +77,18 @@ fkymJDb8szoEXufaaDkRmm7tqOfAtCU=
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vph3.crous-caen.fr/Shibboleth.sso/SAML/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vph3.crous-caen.fr/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://vph3.crous-caen.fr/Shibboleth.sso/SAML/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://vph3.crous-caen.fr/Shibboleth.sso/SAML2/POST" index="0"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="fr">Plateforme Heberg3 du CROUS de Caen</md:ServiceName>
-      <md:ServiceName xml:lang="en">https://vph3.crous-caen.fr</md:ServiceName>
+      <md:ServiceName xml:lang="en">http://vph3.crous-caen.fr</md:ServiceName>
       <md:ServiceDescription xml:lang="fr">Plateforme Heberg3 Crous Caen Normandie</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Plateforme Heberg3 Crous Caen Normandie</md:ServiceDescription>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" 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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/vushib-idp.vanderbilt.edu-idp-Shibboleth.xml b/swamid-interfederations-2.0/vushib-idp.vanderbilt.edu-idp-Shibboleth.xml
index d001b28d..f9bd7dd6 100644
--- a/swamid-interfederations-2.0/vushib-idp.vanderbilt.edu-idp-Shibboleth.xml
+++ b/swamid-interfederations-2.0/vushib-idp.vanderbilt.edu-idp-Shibboleth.xml
@@ -57,35 +57,29 @@ zdub
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIFSzCCBDOgAwIBAgIJAO88oKF6fKkYMA0GCSqGSIb3DQEBBQUAMIHJMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCVE4xEjAQBgNVBAcTCU5hc2h2aWxsZTEeMBwGA1UE
-ChMVVmFuZGVyYmlsdCBVbml2ZXJzaXR5MSgwJgYDVQQLEx9JbmZvcm1hdGlvbiBU
-ZWNobm9sb2d5IFNlcnZpY2VzMSIwIAYDVQQDExl2dXNoaWItaWRwLnZhbmRlcmJp
-bHQuZWR1MSswKQYJKoZIhvcNAQkBFhxpdHMtaWRldkBsaXN0LnZhbmRlcmJpbHQu
-ZWR1MB4XDTExMDQxODE1MjIyNloXDTEzMDQxNzE1MjIyNlowgckxCzAJBgNVBAYT
-AlVTMQswCQYDVQQIEwJUTjESMBAGA1UEBxMJTmFzaHZpbGxlMR4wHAYDVQQKExVW
-YW5kZXJiaWx0IFVuaXZlcnNpdHkxKDAmBgNVBAsTH0luZm9ybWF0aW9uIFRlY2hu
-b2xvZ3kgU2VydmljZXMxIjAgBgNVBAMTGXZ1c2hpYi1pZHAudmFuZGVyYmlsdC5l
-ZHUxKzApBgkqhkiG9w0BCQEWHGl0cy1pZGV2QGxpc3QudmFuZGVyYmlsdC5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyDiDUFG9pVnkihnrdo9We
-5C91M/Uw8fT7U6HGDD7TrtbpkFtfrKA+CyKKRGSDdGZmU/WwmMSb1lp9B08ik4rr
-yXnMKjY32alNnRVYtEyM6nhmIXcGF9QKXoKGTAeugdl5qpkK9BnHbxljNSganKbt
-WjX5h9FSd9NzNHzRc0mAwk8y49GXeD8aadNUbLc9OeA9ZYPJs4CUClX7fE/fryvO
-GGx92jzsk93oCAgTgfAy5h+Xv62wiZzA2fSMshaATNNeRUmnWl6VeupsVgB3fStW
-LrjfuIxczlX6+aguPr8iFF0G9b5kThWklhzncTCTUWID+HCm2uxEGDVkX8QhsNRB
-AgMBAAGjggEyMIIBLjAdBgNVHQ4EFgQUQocVs4R0bNAiHJwylaz9zMykfeAwgf4G
-A1UdIwSB9jCB84AUQocVs4R0bNAiHJwylaz9zMykfeChgc+kgcwwgckxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJUTjESMBAGA1UEBxMJTmFzaHZpbGxlMR4wHAYDVQQK
-ExVWYW5kZXJiaWx0IFVuaXZlcnNpdHkxKDAmBgNVBAsTH0luZm9ybWF0aW9uIFRl
-Y2hub2xvZ3kgU2VydmljZXMxIjAgBgNVBAMTGXZ1c2hpYi1pZHAudmFuZGVyYmls
-dC5lZHUxKzApBgkqhkiG9w0BCQEWHGl0cy1pZGV2QGxpc3QudmFuZGVyYmlsdC5l
-ZHWCCQDvPKChenypGDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAG
-WZi4HiONbj/XJ4yNrAOLmyggytPg7SKp2zeSNS3PUHgGlssLu1u3rHdFJHoRLVEs
-KkRLrYckXJocsKt/OSBUwHcVlv+QgG0zfcpw+Gg5VkZNpmkqZhN6hfHyyl5yXYXc
-EpBh3pUSWq6++3Phdjo//DYrhEGydxH0Yvza1S4J2NFuxKkmpGQdjiXbt7A8EbO4
-M8yvmDR7HXshUk5LqyZ83Tise5tgBbadHO8zCCEutZ6fz5COrIJ2E0LK4u895IZV
-+6m5N02Wx1WoyNXk725WGKI7nQCND7ow4aFbAmyUX0vGzLCU0SsjruqMB9pDTurq
-VOR97db4edIAHOXCqNKQ
+MIIEKzCCAxOgAwIBAgIJAIKe0tZdqVr/MA0GCSqGSIb3DQEBBQUAMIGrMQswCQYD
+VQQGEwJVUzELMAkGA1UECAwCVE4xEjAQBgNVBAcMCU5hc2h2aWxsZTEeMBwGA1UE
+CgwVVmFuZGVyYmlsdCBVbml2ZXJzaXR5MQ0wCwYDVQQLDARWVUlUMSIwIAYDVQQD
+DBl2dXNoaWItaWRwLnZhbmRlcmJpbHQuZWR1MSgwJgYJKoZIhvcNAQkBFhlzc28t
+YWRtaW5zQHZhbmRlcmJpbHQuZWR1MB4XDTE2MDMyNDEzNTU0M1oXDTE5MDMwOTEz
+NTU0M1owgasxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJUTjESMBAGA1UEBwwJTmFz
+aHZpbGxlMR4wHAYDVQQKDBVWYW5kZXJiaWx0IFVuaXZlcnNpdHkxDTALBgNVBAsM
+BFZVSVQxIjAgBgNVBAMMGXZ1c2hpYi1pZHAudmFuZGVyYmlsdC5lZHUxKDAmBgkq
+hkiG9w0BCQEWGXNzby1hZG1pbnNAdmFuZGVyYmlsdC5lZHUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDeEihp8y0j4/IypHdZvRKhPzqpV4jvfcgPj0kF
+ZAFLwvLBSP0IdD5IMCdTPZSACJPP/9Ba9EC2aU8fg4KcYOpIyWZoW3bVTbSXUoQi
++cuq29ZBJ6TSFHkFlcGp2i7IJsGMYrgRnbhUsRviv7xWPTY+bp9IGOV+B04PItpc
+xKp2Eaei7om23m/7GDGTOKvIhvFZAmNAn7RvQF0kwnjq/ep3km/UjIg8Mx53Vzyh
+MTWkS6mCWVlR4z1a2ALCBfLzs84Yrr8X/jUhDDB7HSe0KkKBXAM4Cf75kS7amrvi
+SMoLcKrzDeD906btMAEjZf6YLNGgy6JGYyR5lGqAj+vA0wCdAgMBAAGjUDBOMB0G
+A1UdDgQWBBQZlVfEgKHQ5Jcon98t4Mqy1Rf7FTAfBgNVHSMEGDAWgBQZlVfEgKHQ
+5Jcon98t4Mqy1Rf7FTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDB
+O8IjWDdXZtGRktm9mTgVQoL8uZRftizph0RTL5fxxp/ZWx4dZ0Z+kOESwEeJmVhq
+Y/RHMHJeAvo5i1f3rSsJcH75/w8X/4q+WUg4l/HyzEu93RJIsNzHlT4J/u8WYMvG
+Bi8mgHCKRK9RR/F4PZRuSD9A/K5Vv4VWmptCdD56LO0ecgN9YKl+4MJVj9F09WJr
+uv70NlXEEw+3l92tBXshhoc9CWcvE8p65ZDx7pmk8AtQEUT014Ie4roIQQ5yp7/3
+6rWAv7bdFuGzyTk452DEz9anBPeYXP9tQE5YfGx2XFmyfJC4rtT0N2x0EdnZ8Hyf
+D+k9Zg2iGzOcDf0/XiLU
           </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -142,35 +136,29 @@ zdub
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIFSzCCBDOgAwIBAgIJAO88oKF6fKkYMA0GCSqGSIb3DQEBBQUAMIHJMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCVE4xEjAQBgNVBAcTCU5hc2h2aWxsZTEeMBwGA1UE
-ChMVVmFuZGVyYmlsdCBVbml2ZXJzaXR5MSgwJgYDVQQLEx9JbmZvcm1hdGlvbiBU
-ZWNobm9sb2d5IFNlcnZpY2VzMSIwIAYDVQQDExl2dXNoaWItaWRwLnZhbmRlcmJp
-bHQuZWR1MSswKQYJKoZIhvcNAQkBFhxpdHMtaWRldkBsaXN0LnZhbmRlcmJpbHQu
-ZWR1MB4XDTExMDQxODE1MjIyNloXDTEzMDQxNzE1MjIyNlowgckxCzAJBgNVBAYT
-AlVTMQswCQYDVQQIEwJUTjESMBAGA1UEBxMJTmFzaHZpbGxlMR4wHAYDVQQKExVW
-YW5kZXJiaWx0IFVuaXZlcnNpdHkxKDAmBgNVBAsTH0luZm9ybWF0aW9uIFRlY2hu
-b2xvZ3kgU2VydmljZXMxIjAgBgNVBAMTGXZ1c2hpYi1pZHAudmFuZGVyYmlsdC5l
-ZHUxKzApBgkqhkiG9w0BCQEWHGl0cy1pZGV2QGxpc3QudmFuZGVyYmlsdC5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyDiDUFG9pVnkihnrdo9We
-5C91M/Uw8fT7U6HGDD7TrtbpkFtfrKA+CyKKRGSDdGZmU/WwmMSb1lp9B08ik4rr
-yXnMKjY32alNnRVYtEyM6nhmIXcGF9QKXoKGTAeugdl5qpkK9BnHbxljNSganKbt
-WjX5h9FSd9NzNHzRc0mAwk8y49GXeD8aadNUbLc9OeA9ZYPJs4CUClX7fE/fryvO
-GGx92jzsk93oCAgTgfAy5h+Xv62wiZzA2fSMshaATNNeRUmnWl6VeupsVgB3fStW
-LrjfuIxczlX6+aguPr8iFF0G9b5kThWklhzncTCTUWID+HCm2uxEGDVkX8QhsNRB
-AgMBAAGjggEyMIIBLjAdBgNVHQ4EFgQUQocVs4R0bNAiHJwylaz9zMykfeAwgf4G
-A1UdIwSB9jCB84AUQocVs4R0bNAiHJwylaz9zMykfeChgc+kgcwwgckxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJUTjESMBAGA1UEBxMJTmFzaHZpbGxlMR4wHAYDVQQK
-ExVWYW5kZXJiaWx0IFVuaXZlcnNpdHkxKDAmBgNVBAsTH0luZm9ybWF0aW9uIFRl
-Y2hub2xvZ3kgU2VydmljZXMxIjAgBgNVBAMTGXZ1c2hpYi1pZHAudmFuZGVyYmls
-dC5lZHUxKzApBgkqhkiG9w0BCQEWHGl0cy1pZGV2QGxpc3QudmFuZGVyYmlsdC5l
-ZHWCCQDvPKChenypGDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAG
-WZi4HiONbj/XJ4yNrAOLmyggytPg7SKp2zeSNS3PUHgGlssLu1u3rHdFJHoRLVEs
-KkRLrYckXJocsKt/OSBUwHcVlv+QgG0zfcpw+Gg5VkZNpmkqZhN6hfHyyl5yXYXc
-EpBh3pUSWq6++3Phdjo//DYrhEGydxH0Yvza1S4J2NFuxKkmpGQdjiXbt7A8EbO4
-M8yvmDR7HXshUk5LqyZ83Tise5tgBbadHO8zCCEutZ6fz5COrIJ2E0LK4u895IZV
-+6m5N02Wx1WoyNXk725WGKI7nQCND7ow4aFbAmyUX0vGzLCU0SsjruqMB9pDTurq
-VOR97db4edIAHOXCqNKQ
+MIIEKzCCAxOgAwIBAgIJAIKe0tZdqVr/MA0GCSqGSIb3DQEBBQUAMIGrMQswCQYD
+VQQGEwJVUzELMAkGA1UECAwCVE4xEjAQBgNVBAcMCU5hc2h2aWxsZTEeMBwGA1UE
+CgwVVmFuZGVyYmlsdCBVbml2ZXJzaXR5MQ0wCwYDVQQLDARWVUlUMSIwIAYDVQQD
+DBl2dXNoaWItaWRwLnZhbmRlcmJpbHQuZWR1MSgwJgYJKoZIhvcNAQkBFhlzc28t
+YWRtaW5zQHZhbmRlcmJpbHQuZWR1MB4XDTE2MDMyNDEzNTU0M1oXDTE5MDMwOTEz
+NTU0M1owgasxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJUTjESMBAGA1UEBwwJTmFz
+aHZpbGxlMR4wHAYDVQQKDBVWYW5kZXJiaWx0IFVuaXZlcnNpdHkxDTALBgNVBAsM
+BFZVSVQxIjAgBgNVBAMMGXZ1c2hpYi1pZHAudmFuZGVyYmlsdC5lZHUxKDAmBgkq
+hkiG9w0BCQEWGXNzby1hZG1pbnNAdmFuZGVyYmlsdC5lZHUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDeEihp8y0j4/IypHdZvRKhPzqpV4jvfcgPj0kF
+ZAFLwvLBSP0IdD5IMCdTPZSACJPP/9Ba9EC2aU8fg4KcYOpIyWZoW3bVTbSXUoQi
++cuq29ZBJ6TSFHkFlcGp2i7IJsGMYrgRnbhUsRviv7xWPTY+bp9IGOV+B04PItpc
+xKp2Eaei7om23m/7GDGTOKvIhvFZAmNAn7RvQF0kwnjq/ep3km/UjIg8Mx53Vzyh
+MTWkS6mCWVlR4z1a2ALCBfLzs84Yrr8X/jUhDDB7HSe0KkKBXAM4Cf75kS7amrvi
+SMoLcKrzDeD906btMAEjZf6YLNGgy6JGYyR5lGqAj+vA0wCdAgMBAAGjUDBOMB0G
+A1UdDgQWBBQZlVfEgKHQ5Jcon98t4Mqy1Rf7FTAfBgNVHSMEGDAWgBQZlVfEgKHQ
+5Jcon98t4Mqy1Rf7FTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDB
+O8IjWDdXZtGRktm9mTgVQoL8uZRftizph0RTL5fxxp/ZWx4dZ0Z+kOESwEeJmVhq
+Y/RHMHJeAvo5i1f3rSsJcH75/w8X/4q+WUg4l/HyzEu93RJIsNzHlT4J/u8WYMvG
+Bi8mgHCKRK9RR/F4PZRuSD9A/K5Vv4VWmptCdD56LO0ecgN9YKl+4MJVj9F09WJr
+uv70NlXEEw+3l92tBXshhoc9CWcvE8p65ZDx7pmk8AtQEUT014Ie4roIQQ5yp7/3
+6rWAv7bdFuGzyTk452DEz9anBPeYXP9tQE5YfGx2XFmyfJC4rtT0N2x0EdnZ8Hyf
+D+k9Zg2iGzOcDf0/XiLU
           </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
index 202d22fe..8d315ef1 100644
--- a/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
@@ -34,7 +34,7 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/Redirect"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/POST" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="hu">NIIF kollaborációs portál</md:ServiceName>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index 31bddc72..dbb325d6 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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" registrationInstant="2008-03-28T00:00:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2008-03-28T00:00:00Z" 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>
@@ -122,6 +122,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>WAYF</md:GivenName>
     <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webanno.sfs.uni-tuebingen.de.xml b/swamid-interfederations-2.0/webanno.sfs.uni-tuebingen.de.xml
new file mode 100644
index 00000000..31ebb1a1
--- /dev/null
+++ b/swamid-interfederations-2.0/webanno.sfs.uni-tuebingen.de.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://webanno.sfs.uni-tuebingen.de">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2016-03-22T22:32:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">CLARIN WebAnno</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CLARIN WebAnno</mdui:DisplayName>
+        <mdui:Description xml:lang="de">WebAnno ist ein webbasiertes Allzweck-Werkzeug für linguistische Anmerkungen.</mdui:Description>
+        <mdui:Description xml:lang="en">WebAnno is a general purpose web-based linguistic annotation tool.</mdui:Description>
+        <mdui:Logo height="128" width="128">https://webanno.github.io/webanno/assets/img/logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://webanno.sfs.uni-tuebingen.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://webanno.sfs.uni-tuebingen.de/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/WebLicht_Privacy_Policy_Document</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=wladmin@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=SfS,O=Universitaet Tuebingen,L=Tuebingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKzCCBROgAwIBAgIHF3iUXPRQADANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQG
+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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SLO/POST"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">CLARIN WebAnno</md:ServiceName>
+      <md:ServiceName xml:lang="en">CLARIN WebAnno</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">WebAnno ist ein webbasiertes Allzweck-Werkzeug für linguistische Anmerkungen.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">WebAnno is a general purpose web-based linguistic annotation tool.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marie</md:GivenName>
+    <md:SurName>Hinrichs</md:SurName>
+    <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marie</md:GivenName>
+    <md:SurName>Hinrichs</md:SurName>
+    <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Marie</md:GivenName>
+    <md:SurName>Hinrichs</md:SurName>
+    <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml b/swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml
index 9a9bab2c..67833e54 100644
--- a/swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml
+++ b/swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webclass.uran.ua/shibboleth">
+<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webclass.uran.ua/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://peano.uran.ua" registrationInstant="2015-03-15T11:05:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://peano.uran.ua/~eng/policy.htm</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml b/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml
index e451000d..04063181 100644
--- a/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml
@@ -5,7 +5,7 @@
       <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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</saml:AttributeValue>
@@ -68,13 +68,13 @@ euZKcqmem+nEk8ZZsFxhsTwGLzwlgA+2TEJnP3AeRTiPLzvbYTUprgL0gKt7pg==
     <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:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false" Name="urn:oid:2.16.840.1.113730.3.1.241"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
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 849b0ebb..4611d15f 100644
--- a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
+++ b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblicht.sfs.uni-tuebingen.de">
+<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblicht.sfs.uni-tuebingen.de">
   <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-16T14:52:39Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
@@ -9,19 +9,21 @@
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="de">WebLicht</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">WebLicht</mdui:DisplayName>
-        <mdui:Description xml:lang="de">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:Description xml:lang="de">WebLicht ist eine Service-orientierte Architektur (SOA) zur Erstellung annotierter Textcorpora.</mdui:Description>
+        <mdui:Description xml:lang="en">WebLicht is a service orchestration and execution environment for automatic linguistic annotation.</mdui:Description>
+        <mdui:Logo height="50" width="190">https://weblicht.sfs.uni-tuebingen.de/weblichtwiki/weblicht_button2.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://weblicht.sfs.uni-tuebingen.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/WebLicht_Privacy_Policy_Document</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
@@ -67,13 +69,15 @@ ydKuf18CBYHeixW6XzkCMEdcRTec/qVTn7stpLtuuC5TCblNKGDKmhx9Mec+1Jo=
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="de">WebLicht</md:ServiceName>
       <md:ServiceName xml:lang="en">WebLicht</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">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:ServiceDescription xml:lang="de">WebLicht ist eine Service-orientierte Architektur (SOA) zur Erstellung annotierter Textcorpora.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">WebLicht is a service orchestration and execution environment for automatic linguistic annotation.</md:ServiceDescription>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
@@ -93,13 +97,18 @@ ydKuf18CBYHeixW6XzkCMEdcRTec/qVTn7stpLtuuC5TCblNKGDKmhx9Mec+1Jo=
     <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Department of Linguistics, General and Computational Linguistics</md:GivenName>
-    <md:SurName>Support</md:SurName>
+    <md:GivenName>Marie</md:GivenName>
+    <md:SurName>Hinrichs</md:SurName>
     <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>Department of Linguistics, General and Computational Linguistics</md:GivenName>
-    <md:SurName>Support</md:SurName>
+    <md:GivenName>Marie</md:GivenName>
+    <md:SurName>Hinrichs</md:SurName>
+    <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marie</md:GivenName>
+    <md:SurName>Hinrichs</md:SurName>
     <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml
index c1f17d06..04e99f5d 100644
--- a/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml
@@ -9,7 +9,7 @@
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
       </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
       </saml:Attribute>
@@ -26,8 +26,8 @@
         <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:Logo xml:lang="sv" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.uu.se/#2</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.uu.se/english.html#2</mdui:PrivacyStatementURL>
         <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
diff --git a/swamid-interfederations-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml b/swamid-interfederations-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
index 8b3fabe7..4aa1fe61 100644
--- a/swamid-interfederations-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
@@ -40,71 +40,71 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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="Is Registered User" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Device Identifier" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Device Registration Identifier" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Device Registration DisplayName" Name="http://schemas.microsoft.com/2012/01/devicecontext/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="Device OS type" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Device OS Version" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Is Managed Device" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Forwarded Client IP" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Client Application" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Client User Agent" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Client IP" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Endpoint Path" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Proxy" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Application Identifier" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Application policies" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authority Key Identifier" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Basic Constraint" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Enhanced Key Usage" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Issuer" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Issuer Name" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Key Usage" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Not After" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Not Before" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Certificate Policies" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Public Key" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Certificate Raw Data" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Subject Alternative Name" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Serial Number" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Signature Algorithm" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Subject" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Subject Key Identifier" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Subject Name" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="V2 Template Name" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="V1 Template Name" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Thumbprint" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="X.509 Version" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Inside Corporate Network" Name="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Password Expiration Time" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Password Expiration Days" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Update Password URL" Name="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" 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 Methods References" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Client Request ID" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Alternate Login ID" Name="http://schemas.microsoft.com/ws/2013/11/alternateloginid" 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"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Registered User"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration DisplayName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS type"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS Version"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Managed Device"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Forwarded Client IP"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Application"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client User Agent"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client IP"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Endpoint Path"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Proxy"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application policies"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authority Key Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Basic Constraint"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Enhanced Key Usage"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Key Usage"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not After"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not Before"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Policies"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Public Key"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Raw Data"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Alternative Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Serial Number"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Signature Algorithm"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Key Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V2 Template Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V1 Template Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Thumbprint"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="X.509 Version"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Inside Corporate Network"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Time"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Days"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Update Password URL"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication Methods References"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Request ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2013/11/alternateloginid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Alternate Login ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
   </md:IDPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en-US">Stockholms konstnärliga högskola</md:OrganizationName>
diff --git a/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml b/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml
index d9888c8a..2f8000a8 100644
--- a/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml
+++ b/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml
@@ -138,8 +138,8 @@ pAVuaQQi/FxV7jkz+Rm4HD8R3bhRdVSCpe+2ukW91t385ZQCJuFawcdTDEeHGaDI
       <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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
diff --git a/swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml b/swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml
index 9e078a6c..076d79dc 100644
--- a/swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-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:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd" entityID="https://wiki.edugain.org/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
@@ -53,20 +53,20 @@ nzhoxAesljRTtndfuhYcEnXorpwi2N+4SCaYnF1inyMnJz7xau5lKyxPhA==
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names: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:AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/POST"/>
+    <md:AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/Artifact"/>
+    <md:AssertionConsumerService index="3" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/ECP"/>
+    <md:AssertionConsumerService index="4" isDefault="true" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/POST"/>
+    <md:AssertionConsumerService index="5" Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/Artifact"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">eduGAIN Wiki</md:ServiceName>
       <md:ServiceDescription xml:lang="en">This wiki provides recommendations and instructions on how to enable web services for eduGAIN.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="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:RequestedAttribute FriendlyName="eduPersonTargetedID" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="email" isRequired="false" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" isRequired="false" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="surname" isRequired="false" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" isRequired="false" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/wiki.idem.garrservices.it-shibboleth.xml b/swamid-interfederations-2.0/wiki.idem.garrservices.it-shibboleth.xml
new file mode 100644
index 00000000..09e202ae
--- /dev/null
+++ b/swamid-interfederations-2.0/wiki.idem.garrservices.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:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.idem.garrservices.it/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2016-02-29T15:26:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IDEM GARR AAI Wiki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IDEM GARR AAI Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Wiki for IDEM Federation provided by GARR</mdui:Description>
+        <mdui:Description xml:lang="it">Wiki per la federazione IDEM erogato da GARR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.idem.garrservices.it/GARR-AAI-fed/index.php/About_(EN)</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://wiki.idem.garrservices.it/GARR-AAI-fed/index.php/About_(IT)</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.idem.garrservices.it/GARR-AAI-fed/index.php/Privacy_Policy_(EN)</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://wiki.idem.garrservices.it/GARR-AAI-fed/index.php/Privacy_Policy_(IT)</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDQDCCAiigAwIBAgIJAKTzjRttnw28MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+BAMTGXdpa2kuaWRlbS5nYXJyc2VydmljZXMuaXQwHhcNMTYwMjI5MTM1NzI4WhcN
+MjYwMjI2MTM1NzI4WjAkMSIwIAYDVQQDExl3aWtpLmlkZW0uZ2FycnNlcnZpY2Vz
+Lml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtiuSi0XDOefR0d/R
+REPM2SbEEx01tgsDvfKTzMiS3d2Yz6icdKzrv2ilE5FuJ7c3cXlY87igjyvTCgH3
+XgX5ntltxtL7OrOgbJOzFnyqiPpnXjlxHyNZwN1hGlwPpvPfeDjRvmHP/XToeaWK
+FV6sic41MhFNpsSRbtGQ/tpI+dlKQ1aaltI4ddmIaCMmyBrUj1a4Uu2u5LECHL6d
+dcWeNH5jL8wbJ07bmYEPC9VKeuKP76325PwM+KaWZSDGDAJTZxbWAAio3Ig4UXcv
+5mzyn6UZlyR4asyg3DJ1lqIshYDSidBarihmI1q4I5XE7IT+0eyZBEPcMkZeSKvb
+K4szYwIDAQABo3UwczBSBgNVHREESzBJghl3aWtpLmlkZW0uZ2FycnNlcnZpY2Vz
+Lml0hixodHRwczovL3dpa2kuaWRlbS5nYXJyc2VydmljZXMuaXQvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQU3KghcsYg19GtNWdR8R7kNS5u2CkwDQYJKoZIhvcNAQEFBQAD
+ggEBAHkrvUH347jbNT/ENdukjZhNJJACfx3TVESQMHYzDOvWzcY/sYlthDLx8W6k
+BWNiQj3YVH3+3okIumM65ciGkOdvXuMB57kicjt2czVIC8DsdQdsZcWOxwXD0QvU
+vjkolcS3OOJOCtqvHM9CD2F3TXnJyh7HmxmbcO+2OjM+wtujinlz2cOq+vdiYCfr
+DjHfs4IoDccg5qAXMfFpRA7YcPpnq302RNSRSQB9Ua1fu5tjpUfMiaEZpZAuJYjh
+2HX7QTpJMY99+nan1QBSY8XEZn69EZToLctNW/sgn+eD9+R8JPL0MtMwl5UwncVs
+kZgH+efgngYNisvrFmBVVu7k1/E=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">IDEM GARR AAI Wiki</md:ServiceName>
+      <md:ServiceName xml:lang="it">IDEM GARR AAI Wiki</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Wiki for IDEM Federation provided by GARR</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="it">Wiki per la federazione IDEM erogato da GARR</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Wiki per la federazione IDEM erogato da GARR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Wiki for the IDEM Federation provided by GARR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IDEM</md:GivenName>
+    <md:SurName>Staff</md:SurName>
+    <md:EmailAddress>mailto:idem-staff@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wikispaces.psu.edu-shibboleth.xml b/swamid-interfederations-2.0/wikispaces.psu.edu-shibboleth.xml
new file mode 100644
index 00000000..b6c0722d
--- /dev/null
+++ b/swamid-interfederations-2.0/wikispaces.psu.edu-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://wikispaces.psu.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wikispaces.psu.edu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Penn State WikiSpaces</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://wikispaces.psu.edu/dashboard.action</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.psu.edu/web-privacy-statement</mdui:PrivacyStatementURL>
+        <mdui:Logo height="70" width="130" xml:lang="en">https://www.dept.psu.edu/ids/public/psulogoforincommon.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDzDCCArQCCQDCI8d9i9pvjzANBgkqhkiG9w0BAQUFADCBpzELMAkGA1UEBhMC
+VVMxFTATBgNVBAgMDFBlbm5zeWx2YW5pYTEYMBYGA1UEBwwPVW5pdmVyc2l0eSBQ
+YXJrMSowKAYDVQQKDCFUaGUgUGVubnN5bHZhbmlhIFN0YXRlIFVuaXZlcnNpdHkx
+HjAcBgNVBAsMFUVtZXJnaW5nIFRlY2hub2xvZ2llczEbMBkGA1UEAwwSd2lraXNw
+YWNlcy5wc3UuZWR1MB4XDTE0MDQwOTE1Mzc0MFoXDTM0MDQwNDE1Mzc0MFowgacx
+CzAJBgNVBAYTAlVTMRUwEwYDVQQIDAxQZW5uc3lsdmFuaWExGDAWBgNVBAcMD1Vu
+aXZlcnNpdHkgUGFyazEqMCgGA1UECgwhVGhlIFBlbm5zeWx2YW5pYSBTdGF0ZSBV
+bml2ZXJzaXR5MR4wHAYDVQQLDBVFbWVyZ2luZyBUZWNobm9sb2dpZXMxGzAZBgNV
+BAMMEndpa2lzcGFjZXMucHN1LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALoiOXQkq6k5kNcpwdUjyDNsO2ssYK8kt59DyTM8c4YOr+VBHf4YdU3H
+qHOeXMCP8fIsD9OgcqQFAhojUGvGA9z0mjEQv9/Je8SCGgDjXOdcF+yCo1b50ppY
+jDlDP2wvyKowmXlrxMSZELqR1lRf1SUFA4j1XDiQpV2RtNixmqKPUWXsPFAZTFz/
+wwwFkdA1h/6l7qrdeDtN0Fe83dd88EDjF2Q1QMk2H1rGGdeiz1mTNu4vj8P+KbiO
+hO/D/S59kpJ8jKldbTpkckpnNZHFLJhUl0RlwyTlFGOG25Qwytj/asWxOajSq73h
+HML1ilm7AqPst0Ifk0xvOpg8cbm2p78CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+uZ8ibmbbqYzefrwgrti0kPcixsMpke79L54WcF7X45APwvtUGw27t0N6mEt5ntT3
+yscYdrIzhTl7hCjUJKmjJ55R3a5U4oDgkxRKo9LnGutVyrRTGBnDoZfY8d3zCWPf
+th9ZAPsvojAxSWpkwLIv5ZteTks99bAUsYE81dPx8hNIqSLDxsOROawCnrhTEowy
+1BXL7qYVuWw2cJiTFaL+IVCpltBYmmYUsPTIFSxhQGOljuwx6zY1l61TAivFp3Km
++Yv+iYmBO0r1b3xOFejbmcyGKJzOgu8rje7pSASVviqwvjxAtAZ3iIlZZSQ8Tk/o
+YB840Gg/4ow3pdRVwzYL/g==
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wikispaces.psu.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wikispaces.psu.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikispaces.psu.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wikispaces.psu.edu/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wikispaces.psu.edu/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Penn State WikiSpaces</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Pennsylvania State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Penn State</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.psu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Phil Devan</md:GivenName>
+    <md:EmailAddress>pmd@psu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rich Cropp</md:GivenName>
+    <md:EmailAddress>rac@psu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Christopher Hubing</md:GivenName>
+    <md:EmailAddress>cjh@psu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml b/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml
index 706c8efc..c8fba982 100644
--- a/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml
@@ -31,6 +31,32 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+						MIIDSDCCAjCgAwIBAgIJAI9De290KMmjMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG3d3dy5hdWRpb25ldHdvcmsubmVuLmdvdi51azAeFw0xNjA0MDQxMjA0NDla
+						Fw0yNjA0MDIxMjA0NDlaMCYxJDAiBgNVBAMTG3d3dy5hdWRpb25ldHdvcmsubmVu
+						Lmdvdi51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALs1Xvl+YUxg
+						6qrTPBEvjP6U+Xj56/NxYlBQ0MzjGNDYKOb5wybkgaZF/pcQxLlEzYGvJnYVCazq
+						puniTJlyRAvDHjWzvXb5sdahZCCvfp9Y+xHYa8UuqLxP/oWod7L2ChpL+y0vzLkn
+						yYi20IIPOQQRAr2Dq7lXG0ChHjEwNWWJl35iLVvGSLIKrkEOwHNYBstONR7t+SqW
+						YD0F5la2s7Or1F0UpQSUSXy79FzhJwkyS163ZDZoa/tvBGPrNXjMFROuGJN9lS3L
+						d95KKUP8LHSQK5oZMZw935F3ix2ngI7W/GAlt6Ti3cKDMON03cdnqDc8iyIj4Ik+
+						1BiA6QdXoXECAwEAAaN5MHcwVgYDVR0RBE8wTYIbd3d3LmF1ZGlvbmV0d29yay5u
+						ZW4uZ292LnVrhi5odHRwczovL3d3dy5hdWRpb25ldHdvcmsubmVuLmdvdi51ay9z
+						aGliYm9sZXRoMB0GA1UdDgQWBBTDPBGJEh/Z6ywq5BZ8z7RJmk1oozANBgkqhkiG
+						9w0BAQUFAAOCAQEAeVpk8i9TSBMdQAK6VkXePV/FP3oZYisazSdX0UmizwLsCOyO
+						HXJeSjSwyZ1jnQmyF2L7uf72oBNx6FaqjoekRPFxIBnvs0wKJuLHwIH2NbgMiq+V
+						9rLOfGYZfdn+tJAYtJGuj7LkN14u+/JlP6ym2yZOvY+N6bVg2RFFgeD71p3xTUDv
+						fGsyAXTqQEYU2CngSFCw9d6pq1BN6YwWvDE0QpX3Ls7h6kThEHtFfkDwbWyGEU4/
+						qJWu76dirfXs/94KyGifoqEnn/x6anu70lEhOelauKILot8oovzk9NgQW3r4T9rL
+						ucr/IH/AZ5ql3zVht/DYm/eSHqFItcWR9pgj3w==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfjCCA2agAwIBAgIRAPknBmCnCjGeotNVf6CLdX8wDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA0MTkwMDAwMDBaFw0xNjA0MTgyMzU5NTlaMEYxITAfBgNV
diff --git a/swamid-interfederations-2.0/www.british-history.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.british-history.ac.uk-shibboleth.xml
index 0edc856b..6c5ec265 100644
--- a/swamid-interfederations-2.0/www.british-history.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.british-history.ac.uk-shibboleth.xml
@@ -108,13 +108,13 @@
     <OrganizationURL xml:lang="en">http://www.british-history.ac.uk/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
-    <GivenName>Martin</GivenName>
-    <SurName>Steer</SurName>
-    <EmailAddress>mailto:adam.martin.steer@sas.ac.uk</EmailAddress>
+    <GivenName>Jonathan</GivenName>
+    <SurName>Blaney</SurName>
+    <EmailAddress>mailto:Jonathan.Blaney@sas.ac.uk</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <GivenName>Martin</GivenName>
     <SurName>Steer</SurName>
-    <EmailAddress>mailto:adam.martin.steer@sas.ac.uk</EmailAddress>
+    <EmailAddress>mailto:Martin.Steer@sas.ac.uk</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml b/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml
deleted file mode 100644
index 738d5f47..00000000
--- a/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.chinaclubhq.com/entity">
-  <!--
-		This is a Joomla idemauth 1.5.4 (based on SimpleSAMLPHP) SP for World Club HQ Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <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>
-    </KeyDescriptor>
-    <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>
-    </KeyDescriptor>
-    <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"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <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"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">World Club HQ Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">World Club HQ</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ukclubhq.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Colin</GivenName>
-    <SurName>Maclean</SurName>
-    <EmailAddress>mailto:colin@chinaclubhq.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Colin</GivenName>
-    <SurName>Maclean</SurName>
-    <EmailAddress>mailto:colin@chinaclubhq.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml b/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml
index 44482a26..6ba7f76e 100644
--- a/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml
@@ -7,7 +7,7 @@
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc: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/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
       </saml:Attribute>
diff --git a/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml b/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml
index 186501f6..785a6948 100644
--- a/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml
@@ -22,7 +22,9 @@
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <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://www.dawsonera.com/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://dawsonera.com/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://www.dawsonera.com/Shibboleth.sso/Login" index="1"/>
+      <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://dawsonera.com/Shibboleth.sso/Login" index="2"/>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -73,6 +75,12 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/ECP" index="4"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/POST" index="5"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dawsonera.com/Shibboleth.sso/SAML2/POST" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dawsonera.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dawsonera.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dawsonera.com/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dawsonera.com/Shibboleth.sso/SAML/POST" index="11"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dawsonera.com/Shibboleth.sso/SAML/Artifact" index="12"/>
   </SPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">Dawson Books Limited</OrganizationName>
diff --git a/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml
index 9efbc0e7..052698d9 100644
--- a/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:IDPSSODescriptor WantAuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eenet.ee</shibmd:Scope>
     </md:Extensions>
diff --git a/swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml
index a69cf1c3..3a942085 100644
--- a/swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:IDPSSODescriptor WantAuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eki.ee</shibmd:Scope>
     </md:Extensions>
diff --git a/swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml b/swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
index f6881106..de800f70 100644
--- a/swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
+++ b/swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
@@ -5,7 +5,7 @@
       <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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
@@ -18,7 +18,7 @@
         <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:Logo width="120" height="120">https://www.mediafora.net/mediafora-logo.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
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 ab553f2a..d7ed3cff 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
@@ -9,7 +9,7 @@
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml b/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml
index 6e1cf0a6..b383ce36 100644
--- a/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml
@@ -9,7 +9,7 @@
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index c24a4d5e..9a622a3b 100644
--- a/swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -22,7 +22,7 @@
         <mdui:InformationURL xml:lang="el">https://www.openaire.eu/openaire-report-gr</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.openaire.eu/141-privacy-policy/813-edu-privacy</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="el">https://www.openaire.eu/privacy-gr</mdui:PrivacyStatementURL>
-        <mdui:Logo height="175" width="123" xml:lang="en">https://www.openaire.eu/images/site_images/OpenAIREplus_logo.png</mdui:Logo>
+        <mdui:Logo width="123" height="175" xml:lang="en">https://www.openaire.eu/images/site_images/OpenAIREplus_logo.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml b/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
index 3af1b8dd..0c1ef938 100644
--- a/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
@@ -37,7 +37,7 @@
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
     <md:NameIDFormat>undefined</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://videotorium.hu/Shibboleth.sso/SAML2/POST" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://videotorium.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
diff --git a/swamid-interfederations-2.0/zbgva-edusso.zettabox.com-core-AuthServices.xml b/swamid-interfederations-2.0/zbgva-edusso.zettabox.com-core-AuthServices.xml
index a1040a90..1a7cb8f6 100644
--- a/swamid-interfederations-2.0/zbgva-edusso.zettabox.com-core-AuthServices.xml
+++ b/swamid-interfederations-2.0/zbgva-edusso.zettabox.com-core-AuthServices.xml
@@ -60,10 +60,10 @@ GrEsD4kUa1U=
       <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="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="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>
diff --git a/swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml b/swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml
new file mode 100644
index 00000000..1752cdae
--- /dev/null
+++ b/swamid-interfederations-2.0/zeus.grnet.gr-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://zeus.grnet.gr/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Zeus Elections</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Ψηφοφορίες «Ζευς»</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Zeus Digital Ballot Box is an information system for unimpeachable conduct of confidential voting by purely electronic means</mdui:Description>
+        <mdui:Description xml:lang="el">Η «Ψηφιακή Κάλπη Ζευς» είναι ένα πληροφοριακό σύστημα για την αδιάβλητη διεξαγωγή απόρρητων ψηφοφοριών με αμιγώς ηλεκτρονικό τρόπο</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://zeus.grnet.gr/zeus/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">https://zeus.grnet.gr/zeus/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://zeus.grnet.gr/zeus/terms/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="150" width="890" xml:lang="en">https://zeus.grnet.gr/static/zeus/images/zeus-logo-en.png</mdui:Logo>
+        <mdui:Logo height="150" width="890" xml:lang="el">https://zeus.grnet.gr/static/zeus/images/zeus-logo-el.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://zeus.grnet.gr/shibboleth</ds:KeyName>
+        <ds:KeyName>zeus.grnet.gr</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=zeus.grnet.gr</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDEDCCAfigAwIBAgIJANMdvx+ohi/gMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+                            BAMTDXpldXMuZ3JuZXQuZ3IwHhcNMTYwMjEwMTgzODA0WhcNMjEwMjA4MTgzODA0
+                            WjAYMRYwFAYDVQQDEw16ZXVzLmdybmV0LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOC
+                            AQ8AMIIBCgKCAQEAqZY6MxafENaLnAJEfcQiLe6/q5Pq6SKrihjXRhUVWM+0O7UN
+                            wcVUBnxRqrPA9agOlz0g5619zlfVEwk2QP0iEMKH+1tepVTVulv7QtnQBtaA0vgt
+                            L/iCzvT2CqvhtSNy2NeHuy8HTgaMULaOl7Tf+9cb4qHZbGq3M7YLfMaNWsequmgO
+                            pOd/wYd/o+ba2vtFHcGPTaG1EktGei6hszOihckovBp9yqcntta5XHT06IGOdmln
+                            WS6lakzZ60atmJEdCImq3HjiGce6B6oHxFecWczFi7IgMFtz/aDCQQfVUxzTDdTi
+                            VYhemVnpUBgx2C+sDHQwPTXe9/qQ95UeRznFxwIDAQABo10wWzA6BgNVHREEMzAx
+                            gg16ZXVzLmdybmV0LmdyhiBodHRwczovL3pldXMuZ3JuZXQuZ3Ivc2hpYmJvbGV0
+                            aDAdBgNVHQ4EFgQUNS9rEXnxxLZ028nq/p6Bcx3yI6YwDQYJKoZIhvcNAQEFBQAD
+                            ggEBAGheIDudyldnOYqUWxtfiQ0Q9tt/EVTIixALgYxHCGnZO/OfVlyAwwbnHYf2
+                            r5TJ18HIonEruAGsugPyq8WLANxPINVqry1g6OkgQ959NU6idwJt4fCVe4XE/heY
+                            vnMMNe/Ql01Xph7NgyiB85ABbBr+5YVoKhd7PiDm7h/x9Bp7hlHKFUFuMnx6DsQQ
+                            ONH6NcbuvZtVBDXENeSemkqEG8qxKegGQ4OJM55QRQEt0ZcH2i6EL7y4Mgca8NkP
+                            tUjWB99zWt4Ske4Prz5RAiSsfYvZHl1v4NjFJtSbIp/u8oW8Xk/WSxTrVdq+eqSH
+                            BeFAMmfxrsmNkv2p7y88VjtdsHc=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">Zeus Elections</md:ServiceName>
+      <md:ServiceName xml:lang="el">Ψηφοφορίες «Ζευς»</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Zeus Digital Ballot Box is an information system for unimpeachable conduct of confidential voting by purely electronic means</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="el">Η «Ψηφιακή Κάλπη Ζευς» είναι ένα πληροφοριακό σύστημα για την αδιάβλητη διεξαγωγή απόρρητων ψηφοφοριών με αμιγώς ηλεκτρονικό τρόπο</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Greek Research and Technology Network</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Greek Research and Technology Network</md:Company>
+    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
+    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
+    <md:TelephoneNumber>+30-2109569181</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Greek Research and Technology Network</md:Company>
+    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
+    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-logo-3.png b/swamid-logo-3.png
new file mode 100644
index 00000000..27716780
--- /dev/null
+++ b/swamid-logo-3.png
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index cb143ea7..839351ee 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -504,4 +504,26 @@
   <xi:include href="swamid-2.0/www.vr-rut.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/data.houseoffinance.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/expert.test.antagning.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/www.led.aitp.ladok.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/student.utb.uppfoljning.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/www.ate.ladok.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/student.test.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/student.ate.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/www.cvt.ladok.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/student.ete.grayzone.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/student.cvt.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/se.timeedit.net-kau-student-sp.xml"/>
+  <xi:include href="swamid-2.0/se.timeedit.net-kau-employee-sp.xml"/>
+  <xi:include href="swamid-2.0/student.grayzone.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/www.ete.grayzone.ladok.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/www.grayzone.ladok.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/student.ate.grayzone.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/student.cvt.grayzone.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/student.test.grayzone.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/student.utb.grayzone.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/www.ate.grayzone.ladok.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/www.cvt.grayzone.ladok.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/www.test.grayzone.ladok.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/www.utb.grayzone.ladok.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index f4d61ae2..19ead7ff 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -47,8 +47,6 @@
   <xi:include href="swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.fhs.se-swamid.xml"/>
   <xi:include href="swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/weblogin-test2.kau.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/testidp.lu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.bth.se-idp-shibboleth.xml"/>
@@ -67,4 +65,6 @@
   <xi:include href="swamid-2.0/nya-00.ladok.umu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.his.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml"/>
+  <xi:include href="swamid-2.0/ls00001.mah.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/weblogin.kau.se-idp-shibboleth.xml"/>
 </EntitiesDescriptor>
author	Leif Johansson <leifj@sunet.se>	2016-04-13 11:02:26 +0200
committer	Leif Johansson <leifj@sunet.se>	2016-04-13 11:02:26 +0200
commit	01e1987f6a58b2a53eca633eb7a357358258a72a (patch)
tree	f4e16536264e1b4f00bf03db70ceababf3238e68
parent	52c2e3290d385c31b0e5055db63915c36f8c23b7 (diff)
parent	074d805f823eb30e87343af7c7c3ede4061b9e8f (diff)