diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
index 4fcf3c37..57c1d42d 100644
--- a/mdx/at_aconet/beans.xml
+++ b/mdx/at_aconet/beans.xml
@@ -73,15 +73,6 @@
         <property name="verificationCertificate" ref="at_aconet_signingCertificate"/>
     </bean>
     
-    <!--
-        at_aconet_registrar
-        
-        Unique ID for the registrar associated with this channel.
-    -->
-    <bean id="at_aconet_registrar" class="java.lang.String">
-        <constructor-arg value="http://eduid.at"/>
-    </bean>
-    
     <!--
         at_aconet_check_regauth
         
diff --git a/mdx/cl_cofre/beans.xml b/mdx/cl_cofre/beans.xml
index 42b9628d..d7381766 100644
--- a/mdx/cl_cofre/beans.xml
+++ b/mdx/cl_cofre/beans.xml
@@ -52,15 +52,6 @@
         <property name="verificationCertificate" ref="cl_cofre_signingCertificate"/>
     </bean>
     
-    <!--
-        cl_cofre_registrar
-        
-        Unique ID for the registrar associated with this channel.
-    -->
-    <bean id="cl_cofre_registrar" class="java.lang.String">
-        <constructor-arg value="http://cofre.reuna.cl"/>
-    </bean>
-    
     <!--
         cl_cofre_check_regauth
         
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index a3307c98..669ca938 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -461,15 +461,23 @@
     <!--
         Federation registrationAuthority URIs.
     -->
-    <bean id="ar_mate_registrar"    parent="String" c:_0="http://www.federacionmate.gob.ar"/>
-    <bean id="am_afire_registrar"   parent="String" c:_0="http://afire.asnet.am"/>
-    <bean id="au_aaf_registrar"     parent="String" c:_0="http://aaf.edu.au/"/>
-    <bean id="co_colfire_registrar" parent="String" c:_0="http://colfire.co"/>
-    <bean id="ec_minga_registrar"   parent="String" c:_0="https://minga.cedia.org.ec"/>
-    <bean id="hr_eduhr_registrar"   parent="String" c:_0="http://www.srce.hr"/>
-    <bean id="il_iif_registrar"     parent="String" c:_0="http://iif.iucc.ac.il"/>
-    <bean id="jp_gakunin_registrar" parent="String" c:_0="https://www.gakunin.jp"/>
-    <bean id="lt_litnet_registrar"  parent="String" c:_0="https://fedi.litnet.lt"/>
+    <bean id="ar_mate_registrar"     parent="String" c:_0="http://www.federacionmate.gob.ar"/>
+    <bean id="am_afire_registrar"    parent="String" c:_0="http://afire.asnet.am"/>
+    <bean id="at_aconet_registrar"   parent="String" c:_0="http://eduid.at"/>
+    <bean id="au_aaf_registrar"      parent="String" c:_0="http://aaf.edu.au/"/>
+    <bean id="cl_cofre_registrar"    parent="String" c:_0="http://cofre.reuna.cl"/>
+    <bean id="co_colfire_registrar"  parent="String" c:_0="http://colfire.co"/>
+    <bean id="ec_minga_registrar"    parent="String" c:_0="https://minga.cedia.org.ec"/>
+    <bean id="fr_renater_registrar"  parent="String" c:_0="https://federation.renater.fr/"/>
+    <bean id="hr_eduhr_registrar"    parent="String" c:_0="http://www.srce.hr"/>
+    <bean id="hu_eduid_registrar"    parent="String" c:_0="http://eduid.hu"/>
+    <bean id="ie_edugate_registrar"  parent="String" c:_0="http://www.heanet.ie"/>
+    <bean id="il_iif_registrar"      parent="String" c:_0="http://iif.iucc.ac.il"/>
+    <bean id="jp_gakunin_registrar"  parent="String" c:_0="https://www.gakunin.jp"/>
+    <bean id="lt_litnet_registrar"   parent="String" c:_0="https://fedi.litnet.lt"/>
+    <bean id="pl_pionier_registrar"  parent="String" c:_0="http://aai.pionier.net.pl"/>
+    <bean id="se_swamid_registrar"   parent="String" c:_0="http://www.swamid.se/"/>
+    <bean id="us_incommon_registrar" parent="String" c:_0="https://incommon.org"/>
     
     <!--
         identificationStrategy
@@ -491,33 +499,33 @@
                     
                     http://www.edugain.org/technical/status.php
                 -->
-                <entry key="http://eduid.at"                  value="AT"/>
+                <entry key-ref="at_aconet_registrar"          value="AT"/>
                 <entry key="http://federation.belnet.be/"     value="BE"/>
                 <entry key="http://cafe.rnp.br"               value="BR"/>
                 <entry key="http://www.canarie.ca"            value="CA"/>
-                <entry key="http://cofre.reuna.cl"            value="CL"/>
+                <entry key-ref="cl_cofre_registrar"           value="CL"/>
                 <entry key-ref="hr_eduhr_registrar"           value="HR"/>
                 <entry key="http://www.eduid.cz/"             value="CZ"/>
                 <entry key="https://www.wayf.dk"              value="DK"/>
                 <entry key-ref="ec_minga_registrar"           value="EC"/>
                 <entry key="http://www.csc.fi/haka"           value="FI"/>
-                <entry key="https://federation.renater.fr/"   value="FR"/>
+                <entry key-ref="fr_renater_registrar"         value="FR"/>
                 <entry key="https://www.aai.dfn.de"           value="DE"/>
                 <entry key="http://aai.grnet.gr/"             value="GR"/>
-                <entry key="http://eduid.hu"                  value="HU"/>
-                <entry key="http://www.heanet.ie"             value="IE"/>
+                <entry key-ref="hu_eduid_registrar"           value="HU"/>
+                <entry key-ref="ie_edugate_registrar"         value="IE"/>
                 <entry key="http://www.idem.garr.it/"         value="IT"/>
                 <entry key-ref="jp_gakunin_registrar"         value="JP"/>
                 <entry key="http://laife.lanet.lv/"           value="LV"/>
                 <entry key-ref="lt_litnet_registrar"          value="LT"/>
                 <entry key="http://feide.no/"                 value="NO"/>
-                <entry key="http://aai.pionier.net.pl"        value="PL"/>
+                <entry key-ref="pl_pionier_registrar"         value="PL"/>
                 <entry key="http://aai.arnes.si"              value="SI"/>
                 <entry key="http://www.rediris.es/"           value="ES"/>
-                <entry key="http://www.swamid.se/"            value="SE"/>
+                <entry key-ref="se_swamid_registrar"          value="SE"/>
                 <entry key="http://rr.aai.switch.ch/"         value="CH"/>
                 <entry key="http://www.surfconext.nl/"        value="NL"/>
-                <entry key="https://incommon.org"             value="US"/>
+                <entry key-ref="us_incommon_registrar"        value="US"/>
                 <entry key="http://ukfederation.org.uk"       value="UK"/>
                 
                 <!-- Joining eduGAIN -->
diff --git a/mdx/fr_renater/beans.xml b/mdx/fr_renater/beans.xml
index 4a9fbec8..209af1e8 100644
--- a/mdx/fr_renater/beans.xml
+++ b/mdx/fr_renater/beans.xml
@@ -104,15 +104,6 @@
         <property name="permittingEmptyReferences" value="true"/>
     </bean>
     
-    <!--
-        fr_renater_registrar
-        
-        Unique ID for the registrar associated with this channel.
-    -->
-    <bean id="fr_renater_registrar" class="java.lang.String">
-        <constructor-arg value="https://federation.renater.fr/"/>
-    </bean>
-    
     <!--
         fr_renater_check_regauth
         
diff --git a/mdx/hu_eduid/beans.xml b/mdx/hu_eduid/beans.xml
index f9d369be..9eb23676 100644
--- a/mdx/hu_eduid/beans.xml
+++ b/mdx/hu_eduid/beans.xml
@@ -74,15 +74,6 @@
         p:id="hu_eduid_stripEntityAttributesNamespace"
         p:namespace="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info"/>
 
-    <!--
-        hu_eduid_registrar
-        
-        Unique ID for the registrar associated with this channel.
-    -->
-    <bean id="hu_eduid_registrar" class="java.lang.String">
-        <constructor-arg value="http://eduid.hu"/>
-    </bean>
-    
     <!--
         hu_eduid_check_regauth
         
diff --git a/mdx/ie_edugate/beans.xml b/mdx/ie_edugate/beans.xml
index 59cc6135..deab5bfe 100644
--- a/mdx/ie_edugate/beans.xml
+++ b/mdx/ie_edugate/beans.xml
@@ -78,15 +78,6 @@
         <property name="maxValidityInterval" value="#{ 1000L * 60 * 60 * 24 * 14 }"/>
     </bean>
     
-    <!--
-        ie_edugate_registrar
-        
-        Unique ID for the registrar associated with this channel.
-    -->
-    <bean id="ie_edugate_registrar" class="java.lang.String">
-        <constructor-arg value="http://edugate.heanet.ie"/>
-    </bean>
-    
     <!--
         ie_edugate_check_regauth
         
diff --git a/mdx/pl_pionier/beans.xml b/mdx/pl_pionier/beans.xml
index df44df76..1dfc9cfa 100644
--- a/mdx/pl_pionier/beans.xml
+++ b/mdx/pl_pionier/beans.xml
@@ -84,15 +84,6 @@
         <property name="verificationCertificate" ref="pl_pionier_edugainCertificate"/>
     </bean>
     
-    <!--
-        pl_pionier_registrar
-        
-        Unique ID for the registrar associated with this channel.
-    -->
-    <bean id="pl_pionier_registrar" class="java.lang.String">
-        <constructor-arg value="https://aai.pionier.net.pl"/>
-    </bean>
-    
     <!--
         pl_pionier_check_regauth
         
diff --git a/mdx/se_swamid/beans.xml b/mdx/se_swamid/beans.xml
index 77fa9495..ddf52177 100644
--- a/mdx/se_swamid/beans.xml
+++ b/mdx/se_swamid/beans.xml
@@ -74,15 +74,6 @@
         <property name="permittingEmptyReferences" value="true"/>
     </bean>
     
-    <!--
-        se_swamid_registrar
-        
-        Unique ID for the registrar associated with this channel.
-    -->
-    <bean id="se_swamid_registrar" class="java.lang.String">
-        <constructor-arg value="http://www.swamid.se/"/>
-    </bean>
-    
     <!--
         se_swamid_check_regauth
         
diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml
index b64b0d3e..1d113c63 100644
--- a/mdx/us_incommon/beans.xml
+++ b/mdx/us_incommon/beans.xml
@@ -60,18 +60,6 @@
         <property name="verificationCertificate" ref="us_incommon_signingCertificate"/>
     </bean>
 
-    <!--
-        us_incommon_registrar
-        
-        Unique ID for the registrar associated with this channel.
-        
-        This isn't a formalised value, but a placeholder Tom Scavo thinks
-        might be what they will end up using.
-    -->
-    <bean id="us_incommon_registrar" class="java.lang.String">
-        <constructor-arg value="https://incommon.org"/>
-    </bean>
-    
     <!--
         us_incommon_check_regauth