diff --git a/build.xml b/build.xml
index 382b18ee..489ea75f 100644
--- a/build.xml
+++ b/build.xml
@@ -83,7 +83,7 @@
     -->
     <property name="tools.dir" value="tools"/>
     <property name="tools.ant" value="${tools.dir}/ant"/>
-    <property name="tools.mda" value="${tools.dir}/aggregator-cli-0.9.0"/>
+    <property name="tools.mda" value="${tools.dir}/aggregator-cli-0.9.1"/>
     <property name="tools.mdnorm" value="${tools.dir}/mdnorm"/>
     <property name="tools.metadatatool" value="${tools.dir}/metadatatool"/>
     <property name="tools.xmlsectool" value="${tools.dir}/xmlsectool"/>
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 3f9c4ab4..f99e7ec6 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -245,6 +245,9 @@
 
     <!-- *** Parent beans for Shibboleth MDA components. *** -->
 
+    <bean id="CRDetectionStage" abstract="true" parent="stage_parent"
+        class="net.shibboleth.metadata.dom.CRDetectionStage"/>
+    
     <bean id="ElementWhitespaceTrimmingStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.ElementWhitespaceTrimmingStage"/>
     
@@ -301,9 +304,6 @@
 
     <!-- *** Parent beans for ukf-mda. *** -->
 
-    <bean id="CRDetectionStage" abstract="true" parent="stage_parent"
-        class="uk.org.ukfederation.mda.dom.CRDetectionStage"/>
-
     <bean id="EntityAttributeAddingStage" abstract="true" parent="stage_parent"
         class="uk.org.ukfederation.mda.dom.saml.mdattr.EntityAttributeAddingStage"/>
 
diff --git a/tools/aggregator-cli-0.9.0/cpappend.bat b/tools/aggregator-cli-0.9.1/cpappend.bat
similarity index 100%
rename from tools/aggregator-cli-0.9.0/cpappend.bat
rename to tools/aggregator-cli-0.9.1/cpappend.bat
diff --git a/tools/aggregator-cli-0.9.0/doc/LICENSE.txt b/tools/aggregator-cli-0.9.1/doc/LICENSE.txt
similarity index 100%
rename from tools/aggregator-cli-0.9.0/doc/LICENSE.txt
rename to tools/aggregator-cli-0.9.1/doc/LICENSE.txt
diff --git a/tools/aggregator-cli-0.9.0/lib/aggregator-cli-0.9.0.jar b/tools/aggregator-cli-0.9.1/lib/aggregator-cli-0.9.1.jar
similarity index 67%
rename from tools/aggregator-cli-0.9.0/lib/aggregator-cli-0.9.0.jar
rename to tools/aggregator-cli-0.9.1/lib/aggregator-cli-0.9.1.jar
index a0d9d97e..19330f8e 100644
Binary files a/tools/aggregator-cli-0.9.0/lib/aggregator-cli-0.9.0.jar and b/tools/aggregator-cli-0.9.1/lib/aggregator-cli-0.9.1.jar differ
diff --git a/tools/aggregator-cli-0.9.0/lib/aggregator-pipeline-0.9.0.jar b/tools/aggregator-cli-0.9.1/lib/aggregator-pipeline-0.9.1.jar
similarity index 99%
rename from tools/aggregator-cli-0.9.0/lib/aggregator-pipeline-0.9.0.jar
rename to tools/aggregator-cli-0.9.1/lib/aggregator-pipeline-0.9.1.jar
index d4572631..e715bce2 100644
Binary files a/tools/aggregator-cli-0.9.0/lib/aggregator-pipeline-0.9.0.jar and b/tools/aggregator-cli-0.9.1/lib/aggregator-pipeline-0.9.1.jar differ
diff --git a/tools/aggregator-cli-0.9.0/lib/aopalliance-1.0.jar b/tools/aggregator-cli-0.9.1/lib/aopalliance-1.0.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/aopalliance-1.0.jar
rename to tools/aggregator-cli-0.9.1/lib/aopalliance-1.0.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/bcprov-jdk15on-1.53.jar b/tools/aggregator-cli-0.9.1/lib/bcprov-jdk15on-1.53.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/bcprov-jdk15on-1.53.jar
rename to tools/aggregator-cli-0.9.1/lib/bcprov-jdk15on-1.53.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/commons-codec-1.10.jar b/tools/aggregator-cli-0.9.1/lib/commons-codec-1.10.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/commons-codec-1.10.jar
rename to tools/aggregator-cli-0.9.1/lib/commons-codec-1.10.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/cryptacular-1.0.jar b/tools/aggregator-cli-0.9.1/lib/cryptacular-1.0.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/cryptacular-1.0.jar
rename to tools/aggregator-cli-0.9.1/lib/cryptacular-1.0.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/guava-18.0.jar b/tools/aggregator-cli-0.9.1/lib/guava-18.0.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/guava-18.0.jar
rename to tools/aggregator-cli-0.9.1/lib/guava-18.0.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/httpclient-4.3.6.jar b/tools/aggregator-cli-0.9.1/lib/httpclient-4.3.6.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/httpclient-4.3.6.jar
rename to tools/aggregator-cli-0.9.1/lib/httpclient-4.3.6.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/httpclient-cache-4.3.6.jar b/tools/aggregator-cli-0.9.1/lib/httpclient-cache-4.3.6.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/httpclient-cache-4.3.6.jar
rename to tools/aggregator-cli-0.9.1/lib/httpclient-cache-4.3.6.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/httpcore-4.3.3.jar b/tools/aggregator-cli-0.9.1/lib/httpcore-4.3.3.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/httpcore-4.3.3.jar
rename to tools/aggregator-cli-0.9.1/lib/httpcore-4.3.3.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/java-support-7.2.0.jar b/tools/aggregator-cli-0.9.1/lib/java-support-7.2.0.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/java-support-7.2.0.jar
rename to tools/aggregator-cli-0.9.1/lib/java-support-7.2.0.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/jcl-over-slf4j-1.7.12.jar b/tools/aggregator-cli-0.9.1/lib/jcl-over-slf4j-1.7.12.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/jcl-over-slf4j-1.7.12.jar
rename to tools/aggregator-cli-0.9.1/lib/jcl-over-slf4j-1.7.12.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/jcommander-1.48.jar b/tools/aggregator-cli-0.9.1/lib/jcommander-1.48.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/jcommander-1.48.jar
rename to tools/aggregator-cli-0.9.1/lib/jcommander-1.48.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/joda-time-2.9.jar b/tools/aggregator-cli-0.9.1/lib/joda-time-2.9.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/joda-time-2.9.jar
rename to tools/aggregator-cli-0.9.1/lib/joda-time-2.9.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/jsr305-3.0.1.jar b/tools/aggregator-cli-0.9.1/lib/jsr305-3.0.1.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/jsr305-3.0.1.jar
rename to tools/aggregator-cli-0.9.1/lib/jsr305-3.0.1.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/logback-classic-1.1.3.jar b/tools/aggregator-cli-0.9.1/lib/logback-classic-1.1.3.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/logback-classic-1.1.3.jar
rename to tools/aggregator-cli-0.9.1/lib/logback-classic-1.1.3.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/logback-core-1.1.3.jar b/tools/aggregator-cli-0.9.1/lib/logback-core-1.1.3.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/logback-core-1.1.3.jar
rename to tools/aggregator-cli-0.9.1/lib/logback-core-1.1.3.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/slf4j-api-1.7.12.jar b/tools/aggregator-cli-0.9.1/lib/slf4j-api-1.7.12.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/slf4j-api-1.7.12.jar
rename to tools/aggregator-cli-0.9.1/lib/slf4j-api-1.7.12.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/spring-aop-4.2.3.RELEASE.jar b/tools/aggregator-cli-0.9.1/lib/spring-aop-4.2.3.RELEASE.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/spring-aop-4.2.3.RELEASE.jar
rename to tools/aggregator-cli-0.9.1/lib/spring-aop-4.2.3.RELEASE.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/spring-beans-4.2.3.RELEASE.jar b/tools/aggregator-cli-0.9.1/lib/spring-beans-4.2.3.RELEASE.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/spring-beans-4.2.3.RELEASE.jar
rename to tools/aggregator-cli-0.9.1/lib/spring-beans-4.2.3.RELEASE.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/spring-context-4.2.3.RELEASE.jar b/tools/aggregator-cli-0.9.1/lib/spring-context-4.2.3.RELEASE.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/spring-context-4.2.3.RELEASE.jar
rename to tools/aggregator-cli-0.9.1/lib/spring-context-4.2.3.RELEASE.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/spring-core-4.2.3.RELEASE.jar b/tools/aggregator-cli-0.9.1/lib/spring-core-4.2.3.RELEASE.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/spring-core-4.2.3.RELEASE.jar
rename to tools/aggregator-cli-0.9.1/lib/spring-core-4.2.3.RELEASE.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/spring-expression-4.2.3.RELEASE.jar b/tools/aggregator-cli-0.9.1/lib/spring-expression-4.2.3.RELEASE.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/spring-expression-4.2.3.RELEASE.jar
rename to tools/aggregator-cli-0.9.1/lib/spring-expression-4.2.3.RELEASE.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/spring-extensions-5.2.0.jar b/tools/aggregator-cli-0.9.1/lib/spring-extensions-5.2.0.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/spring-extensions-5.2.0.jar
rename to tools/aggregator-cli-0.9.1/lib/spring-extensions-5.2.0.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/stax-api-1.0-2.jar b/tools/aggregator-cli-0.9.1/lib/stax-api-1.0-2.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/stax-api-1.0-2.jar
rename to tools/aggregator-cli-0.9.1/lib/stax-api-1.0-2.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/stax2-api-3.1.4.jar b/tools/aggregator-cli-0.9.1/lib/stax2-api-3.1.4.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/stax2-api-3.1.4.jar
rename to tools/aggregator-cli-0.9.1/lib/stax2-api-3.1.4.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/woodstox-core-asl-4.4.1.jar b/tools/aggregator-cli-0.9.1/lib/woodstox-core-asl-4.4.1.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/woodstox-core-asl-4.4.1.jar
rename to tools/aggregator-cli-0.9.1/lib/woodstox-core-asl-4.4.1.jar
diff --git a/tools/aggregator-cli-0.9.0/lib/xmlsec-2.0.5.jar b/tools/aggregator-cli-0.9.1/lib/xmlsec-2.0.5.jar
similarity index 100%
rename from tools/aggregator-cli-0.9.0/lib/xmlsec-2.0.5.jar
rename to tools/aggregator-cli-0.9.1/lib/xmlsec-2.0.5.jar
diff --git a/tools/aggregator-cli-0.9.0/mda.bat b/tools/aggregator-cli-0.9.1/mda.bat
similarity index 100%
rename from tools/aggregator-cli-0.9.0/mda.bat
rename to tools/aggregator-cli-0.9.1/mda.bat
diff --git a/tools/aggregator-cli-0.9.0/mda.sh b/tools/aggregator-cli-0.9.1/mda.sh
similarity index 100%
rename from tools/aggregator-cli-0.9.0/mda.sh
rename to tools/aggregator-cli-0.9.1/mda.sh