diff --git a/build.xml b/build.xml
index 31edf09d..1c8355c7 100644
--- a/build.xml
+++ b/build.xml
@@ -571,6 +571,12 @@
                 	<fileset dir="${tools.dir}/ukf-mda">
                 		<include name="*.jar"/>
                 	</fileset>
+                	<fileset dir="${tools.dir}/xalan/lib">
+                		<include name="sdss-xalan-md-*.jar"/>
+                	</fileset>
+                    <fileset dir="${tools.dir}/xalan/lib">
+                        <include name="ukf-members-*.jar"/>
+                    </fileset>
                 </classpath>
                 <jvmarg value="-Djava.endorsed.dirs=${tools.mda}/lib/endorsed"/>
             	<jvmarg value="-Dlogback.configurationFile=${tools.dir}/ukf-mda/logback.xml"/>
@@ -1030,16 +1036,6 @@
         *********************************************
     -->
 	
-    <macrodef name="CHECK.imported">
-        <attribute name="i"/>
-        <sequential>
-            <CHECK.std i="@{i}">
-                <arg value="${build.dir}/check_future.xsl"/>
-                <arg value="${build.dir}/check_saml2int.xsl"/>
-            </CHECK.std>
-        </sequential>
-    </macrodef>
-    
     <!--
         ***************************
         ***                     ***
@@ -1053,7 +1049,6 @@
     <target name="flow.aaf.import">
         <echo>Running AAF import flow.</echo>
         <MDA config="${aaf.dir}/aaf-import.xml" out="${aaf.dir}/imported.xml"/>
-        <CHECK.imported i="${aaf.dir}/imported.xml"/>
         <echo>Completed AAF import flow.</echo>
     </target>
     
@@ -1070,7 +1065,6 @@
     <target name="flow.arnes.import">
         <echo>Running ARNES import flow.</echo>
         <MDA config="${arnes.dir}/arnes-import.xml" out="${arnes.dir}/imported.xml"/>
-        <CHECK.imported i="${arnes.dir}/imported.xml"/>
         <echo>Completed ARNES import flow.</echo>
     </target>
     
@@ -1087,7 +1081,6 @@
     <target name="flow.caf.import">
         <echo>Running CAF import flow.</echo>
         <MDA config="${caf.dir}/caf-import.xml" out="${caf.dir}/imported.xml"/>
-        <CHECK.imported i="${caf.dir}/imported.xml"/>
         <echo>Completed CAF import flow.</echo>
     </target>
     
@@ -1104,7 +1097,6 @@
 	<target name="flow.edugate.import">
         <echo>Running Edugate import flow.</echo>
         <MDA config="${edugate.dir}/edugate-import.xml" out="${edugate.dir}/imported.xml"/>
-        <CHECK.imported i="${edugate.dir}/imported.xml"/>
         <echo>Completed Edugate import flow.</echo>
     </target>
     
@@ -1121,7 +1113,6 @@
     <target name="flow.incommon.import">
         <echo>Running InCommon import flow.</echo>
         <MDA config="${incommon.dir}/incommon-import.xml" out="${incommon.dir}/imported.xml"/>
-        <CHECK.imported i="${incommon.dir}/imported.xml"/>
         <echo>Completed InCommon import flow.</echo>
     </target>
     
@@ -1138,7 +1129,6 @@
     <target name="flow.edugain.import">
         <echo>Running eduGAIN import flow.</echo>
         <MDA config="${edugain.dir}/edugain-import.xml" out="${edugain.dir}/imported.xml"/>
-        <CHECK.imported i="${edugain.dir}/imported.xml"/>
         <echo>Completed eduGAIN import flow.</echo>
     </target>
     
@@ -1155,7 +1145,6 @@
 	<target name="flow.swamid.import">
 		<echo>Running SWAMID import flow.</echo>
 		<MDA config="${swamid.dir}/swamid-import.xml" out="${swamid.dir}/imported.xml"/>
-		<CHECK.imported i="${swamid.dir}/imported.xml"/>
 		<echo>Completed SWAMID import flow.</echo>
 	</target>
     
@@ -1172,7 +1161,6 @@
     <target name="flow.switch.import">
         <echo>Running SWITCH import flow.</echo>
         <MDA config="${switch.dir}/switch-import.xml" out="${switch.dir}/imported.xml"/>
-        <CHECK.imported i="${switch.dir}/imported.xml"/>
         <echo>Completed SWITCH import flow.</echo>
     </target>
     
@@ -1186,17 +1174,7 @@
 	
     <target name="flow.uk.collect">
         <echo>Collecting UK fragment files.</echo>
-        
-        <!--
-            Run the aggregator CLI to collect the metadata.
-        -->
         <MDA config="${mdx.dir}/uk/uk-collect.xml" out="${mdx.dir}/uk/collected.xml"/>
-        
-        <!--
-            Run checking rulesets.
-        -->
-        <CHECK i="${xml.dir}/${uk.master.file}" s="check.xsl"/>
-        
         <echo>Collection completed.</echo>
     </target>
     
diff --git a/mdx/aaf/aaf-import.xml b/mdx/aaf/aaf-import.xml
index 04eddfcb..cb3ea051 100644
--- a/mdx/aaf/aaf-import.xml
+++ b/mdx/aaf/aaf-import.xml
@@ -22,10 +22,10 @@
                 <ref bean="fetchAafExportAggregate"/>
                 <ref bean="checkAafSignature"/>
                 <ref bean="errorAnnouncingFilter"/>
-                <ref bean="cleanImport"/>
                 <ref bean="disassemble"/>
-                <ref bean="checkSchemas"/>
-                <ref bean="errorAnnouncingFilter"/>
+                
+                <ref bean="standardImportActions"/>
+                
                 <ref bean="assemble"/>
             </list>
         </property>
diff --git a/mdx/arnes/arnes-import.xml b/mdx/arnes/arnes-import.xml
index 3141aaed..e2828578 100644
--- a/mdx/arnes/arnes-import.xml
+++ b/mdx/arnes/arnes-import.xml
@@ -22,10 +22,10 @@
                 <ref bean="fetchArnesExportAggregate"/>
                 <ref bean="checkArnesSignature"/>
                 <ref bean="errorAnnouncingFilter"/>
-                <ref bean="cleanImport"/>
                 <ref bean="disassemble"/>
-                <ref bean="checkSchemas"/>
-                <ref bean="errorAnnouncingFilter"/>
+                
+                <ref bean="standardImportActions"/>
+                
                 <ref bean="assemble"/>
             </list>
         </property>
diff --git a/mdx/caf/caf-import.xml b/mdx/caf/caf-import.xml
index 78e9ce85..11687e00 100644
--- a/mdx/caf/caf-import.xml
+++ b/mdx/caf/caf-import.xml
@@ -22,10 +22,10 @@
                 <ref bean="fetchCafExportAggregate"/>
                 <ref bean="checkCafSignature"/>
                 <ref bean="errorAnnouncingFilter"/>
-                <ref bean="cleanImport"/>
                 <ref bean="disassemble"/>
-                <ref bean="checkSchemas"/>
-                <ref bean="errorAnnouncingFilter"/>
+                
+                <ref bean="standardImportActions"/>
+                
                 <ref bean="assemble"/>
             </list>
         </property>
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index e3b99861..3f106229 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -9,12 +9,18 @@
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
 
+    <!--
+        Import beans related to metadata validation.
+    -->
+    <import resource="validation-beans.xml"/>
+    
     <!--
         parserPool
         
         A pre-configured parser pool for use by source stages.
     -->
-    <bean id="parserPool" class="org.opensaml.util.xml.BasicParserPool" init-method="initialize">
+    <bean id="parserPool" class="org.opensaml.util.xml.BasicParserPool"
+        init-method="initialize" lazy-init="true">
         <property name="ignoreComments" value="false"/>
         <property name="ignoreElementContentWhitespace" value="false"/>
     </bean>
@@ -101,7 +107,8 @@
         
         A pipeline stage that checks against all the common schemas, as above.
     -->
-    <bean id="checkSchemas" class="net.shibboleth.metadata.dom.XMLSchemaValidationStage">
+    <bean id="checkSchemas" class="net.shibboleth.metadata.dom.XMLSchemaValidationStage"
+        init-method="initialize" lazy-init="true">
         <property name="id" value="checkSchemas"/>
         <property name="schemaResources" ref="schemaResources"/>
     </bean>
@@ -112,7 +119,8 @@
         A pipeline stage that checks for any errors, and then announces
         and filters any encountered.
     -->
-    <bean id="errorAnnouncingFilter" class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStage">
+    <bean id="errorAnnouncingFilter" class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStage"
+        init-method="initialize" lazy-init="true">
         <property name="id" value="errorAnnouncingFilter"/>
     </bean>
     
@@ -123,7 +131,8 @@
         presented, for example by removing redundant attributes or elements which only have
         meaning when added by the UK federation registrar.
     -->
-    <bean id="cleanImport" class="net.shibboleth.metadata.dom.XSLTStage">
+    <bean id="cleanImport" class="net.shibboleth.metadata.dom.XSLTransformationStage"
+        init-method="initialize" lazy-init="true">
         <property name="id" value="cleanImport"/>
         <property name="xslResource">
             <bean class="org.opensaml.util.resource.FilesystemResource">
@@ -135,14 +144,45 @@
     <!--
         Basic EntitiesDescriptor disassembler pipeline stage.
     -->
-    <bean id="disassemble" class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorDisassemblerStage">
+    <bean id="disassemble" class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorDisassemblerStage"
+        init-method="initialize" lazy-init="true">
         <property name="id" value="disassemble"/>
     </bean>
     
+    <!--
+        Populate ItemId values from entities.
+    -->
+    <bean id="populateItemIds" class="net.shibboleth.metadata.dom.saml.EntityDescriptorItemIdPopulationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="populateItemIds"/>
+    </bean>
+    
+    <!--
+        standardImportActions
+        
+        Standard actions performed on any metadata import channel.  Assumes that the
+        collection has been acquired, had its signature validated, and disassembled into
+        individual entities.
+    -->
+    <bean id="standardImportActions" class="net.shibboleth.metadata.pipeline.CompositeStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="standardImportActions"/>
+        <property name="composedStages">
+            <list>
+                <ref bean="populateItemIds"/>
+                <ref bean="cleanImport"/>
+                <ref bean="checkSchemas"/>
+                <ref bean="CHECK.imported"/>
+                <ref bean="errorAnnouncingFilter"/>
+            </list>
+        </property>
+    </bean>
+    
     <!--
         Basic EntitiesDescriptor assembler pipeline stage.
     -->
-    <bean id="assemble" class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage">
+    <bean id="assemble" class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage"
+        init-method="initialize" lazy-init="true">
         <property name="id" value="assemble"/>
     </bean>
     
diff --git a/mdx/edugain/edugain-import.xml b/mdx/edugain/edugain-import.xml
index cdcc2fc5..06f41acc 100644
--- a/mdx/edugain/edugain-import.xml
+++ b/mdx/edugain/edugain-import.xml
@@ -26,10 +26,10 @@
                 <ref bean="fetchEduGainExportAggregate"/>
                 <ref bean="checkEdugainSignature"/>
                 <ref bean="errorAnnouncingFilter"/>
-                <ref bean="cleanImport"/>
                 <ref bean="disassemble"/>
-                <ref bean="checkSchemas"/>
-                <ref bean="errorAnnouncingFilter"/>
+                
+                <ref bean="standardImportActions"/>
+                
                 <ref bean="assemble"/>
             </list>
         </property>
diff --git a/mdx/edugate/edugate-import.xml b/mdx/edugate/edugate-import.xml
index a9fe987a..63b1bc5d 100644
--- a/mdx/edugate/edugate-import.xml
+++ b/mdx/edugate/edugate-import.xml
@@ -22,10 +22,10 @@
                 <ref bean="fetchEdugateExportAggregate"/>
                 <ref bean="checkEdugateSignature"/>
                 <ref bean="errorAnnouncingFilter"/>
-                <ref bean="cleanImport"/>
                 <ref bean="disassemble"/>
-                <ref bean="checkSchemas"/>
-                <ref bean="errorAnnouncingFilter"/>
+                
+                <ref bean="standardImportActions"/>
+                
                 <ref bean="assemble"/>
             </list>
         </property>
diff --git a/mdx/incommon/incommon-import.xml b/mdx/incommon/incommon-import.xml
index 903fb3e2..450918dd 100644
--- a/mdx/incommon/incommon-import.xml
+++ b/mdx/incommon/incommon-import.xml
@@ -22,10 +22,10 @@
                 <ref bean="fetchInCommonExportAggregate"/>
                 <ref bean="checkInCommonSignature"/>
                 <ref bean="errorAnnouncingFilter"/>
-                <ref bean="cleanImport"/>
                 <ref bean="disassemble"/>
-                <ref bean="checkSchemas"/>
-                <ref bean="errorAnnouncingFilter"/>
+                
+                <ref bean="standardImportActions"/>
+                
                 <ref bean="assemble"/>
             </list>
         </property>
diff --git a/mdx/swamid/swamid-import.xml b/mdx/swamid/swamid-import.xml
index 83bbf2a6..a6f84091 100644
--- a/mdx/swamid/swamid-import.xml
+++ b/mdx/swamid/swamid-import.xml
@@ -22,10 +22,10 @@
                 <ref bean="fetchSwamidExportAggregate"/>
                 <ref bean="checkSwamidSignature"/>
                 <ref bean="errorAnnouncingFilter"/>
-                <ref bean="cleanImport"/>
                 <ref bean="disassemble"/>
-                <ref bean="checkSchemas"/>
-                <ref bean="errorAnnouncingFilter"/>
+                
+                <ref bean="standardImportActions"/>
+                
                 <ref bean="assemble"/>
             </list>
         </property>
diff --git a/mdx/switch/switch-import.xml b/mdx/switch/switch-import.xml
index 868f54d6..1f2e0bc9 100644
--- a/mdx/switch/switch-import.xml
+++ b/mdx/switch/switch-import.xml
@@ -22,10 +22,10 @@
                 <ref bean="fetchSwitchExportAggregate"/>
                 <ref bean="checkSwitchSignature"/>
                 <ref bean="errorAnnouncingFilter"/>
-                <ref bean="cleanImport"/>
                 <ref bean="disassemble"/>
-                <ref bean="checkSchemas"/>
-                <ref bean="errorAnnouncingFilter"/>
+                
+                <ref bean="standardImportActions"/>
+                
                 <ref bean="assemble"/>
             </list>
         </property>
diff --git a/mdx/uk/uk-beans.xml b/mdx/uk/uk-beans.xml
index 1b0edcfc..369d1edc 100644
--- a/mdx/uk/uk-beans.xml
+++ b/mdx/uk/uk-beans.xml
@@ -10,13 +10,16 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
 
     <!--
-        <bean id="members" class="uk.org.ukfederation.members.Members">
+        members
+        
+        This bean implements an API for access to the contents of the members.xml document.
+    -->
+    <bean id="members" class="uk.org.ukfederation.members.Members" lazy-init="true">
         <constructor-arg>
-        <bean class="java.io.File">
-        <constructor-arg value="#{ systemProperties['basedir'] }/xml/members.xml"/>
-        </bean>
+            <bean class="java.io.File">
+                <constructor-arg value="#{ systemProperties['basedir'] }/xml/members.xml"/>
+            </bean>
         </constructor-arg>
-        </bean>
-    -->
+    </bean>
     
 </beans>
diff --git a/mdx/uk/uk-collect.xml b/mdx/uk/uk-collect.xml
index 7c529bd2..8eba035f 100644
--- a/mdx/uk/uk-collect.xml
+++ b/mdx/uk/uk-collect.xml
@@ -18,14 +18,23 @@
         Import UK-specific beans.
     -->
     <import resource="uk-beans.xml"/>
+
+    <!--
+        filterDeletedEntities
         
-    <bean id="filterDeletedEntities" class="uk.org.ukfederation.mda.XPathFilteringStage">
+        Remove entity items which have the ukfedlabel:DeletedEntity label on them.
+        This convention will be replaced at some point by the files not being available
+        for collection in the first place.
+    -->
+    <bean id="filterDeletedEntities" class="uk.org.ukfederation.mda.XPathFilteringStage"
+        init-method="initialize" lazy-init="true">
         <property name="id" value="filterDeletedEntities"/>
         <constructor-arg name="expression" value="//ukfedlabel:DeletedEntity"/>
         <constructor-arg name="prefixMappings" ref="commonNamespaces"/>
     </bean>
     
-    <bean id="fetchUkFragmentFiles" class="net.shibboleth.metadata.dom.DomFilesystemSourceStage">
+    <bean id="fetchUkFragmentFiles" class="net.shibboleth.metadata.dom.DomFilesystemSourceStage"
+        init-method="initialize" lazy-init="true">
         <property name="id" value="fetchUkFragmentFiles"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="source">
@@ -47,8 +56,17 @@
                 <ref bean="fetchUkFragmentFiles"/>
                 <ref bean="filterDeletedEntities"/>
                 <ref bean="checkSchemas"/>
-                <ref bean="errorAnnouncingFilter"/>
+                <ref bean="CHECK.std"/>
+                <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->
                 <ref bean="assemble"/>
+                
+                <!--
+                    It's much faster to run this check on the EntitiesDescriptor because it
+                    loads up a copy of members.xml every time it is used.  This should be
+                    fixed to use a parameter.
+                -->
+                <ref bean="check_check"/>
+                <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->
             </list>
         </property>
     </bean>
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
new file mode 100644
index 00000000..3cd385de
--- /dev/null
+++ b/mdx/validation-beans.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Common validation bean definitions.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+
+    <!--
+        check_adfs
+    -->
+    <bean id="check_adfs" class="net.shibboleth.metadata.dom.XSLValidationStage"
+        lazy-init="true" init-method="initialize">
+        <property name="id" value="check_adfs"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_adfs.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        check_fixups
+    -->
+    <bean id="check_fixups" class="net.shibboleth.metadata.dom.XSLValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="check_fixups"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_fixups.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        check_future
+    -->
+    <bean id="check_future" class="net.shibboleth.metadata.dom.XSLValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="check_future"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_future.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        check_idpdisc
+    -->
+    <bean id="check_idpdisc" class="net.shibboleth.metadata.dom.XSLValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="check_idpdisc"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_idpdisc.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        check_imported
+    -->
+    <bean id="check_imported" class="net.shibboleth.metadata.dom.XSLValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="check_imported"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_imported.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        check_init
+    -->
+    <bean id="check_init" class="net.shibboleth.metadata.dom.XSLValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="check_init"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_init.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        check_mdiop
+    -->
+    <bean id="check_mdiop" class="net.shibboleth.metadata.dom.XSLValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="check_mdiop"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_mdiop.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        check_mdui
+    -->
+    <bean id="check_mdui" class="net.shibboleth.metadata.dom.XSLValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="check_mdui"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_mdui.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        check_misc
+    -->
+    <bean id="check_misc" class="net.shibboleth.metadata.dom.XSLValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="check_misc"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_misc.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        check_namespaces
+    -->
+    <bean id="check_namespaces" class="net.shibboleth.metadata.dom.XSLValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="check_namespaces"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_namespaces.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        check_nokeyname
+    -->
+    <bean id="check_nokeyname" class="net.shibboleth.metadata.dom.XSLValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="check_nokeyname"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_nokeyname.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        check_saml2int
+    -->
+    <bean id="check_saml2int" class="net.shibboleth.metadata.dom.XSLValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="check_saml2int"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_saml2int.xsl"/>
+            </bean>
+        </property>
+    </bean>
+
+    <!--
+        check_shibboleth
+    -->
+    <bean id="check_shibboleth" class="net.shibboleth.metadata.dom.XSLValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="check_shibboleth"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_shibboleth.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        check_vhosts
+    -->
+    <bean id="check_vhosts" class="net.shibboleth.metadata.dom.XSLValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="check_vhosts"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_vhosts.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        check_check
+    -->
+    <bean id="check_check" class="net.shibboleth.metadata.dom.XSLValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="check_check"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/build/check.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        CHECK.std
+    -->
+    <bean id="CHECK.std" class="net.shibboleth.metadata.pipeline.CompositeStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="CHECK.std"/>
+        <property name="composedStages">
+            <list>
+                <ref bean="check_adfs"/>
+                <ref bean="check_idpdisc"/>
+                <ref bean="check_init"/>
+                <ref bean="check_mdiop"/>
+                <ref bean="check_mdui"/>
+                <ref bean="check_misc"/>
+                <ref bean="check_namespaces"/>
+                <ref bean="check_shibboleth"/>
+            </list>
+        </property>
+    </bean>
+    
+    <!--
+        CHECK.imported
+    -->
+    <bean id="CHECK.imported" class="net.shibboleth.metadata.pipeline.CompositeStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="CHECK.imported"/>
+        <property name="composedStages">
+            <list>
+                <ref bean="CHECK.std"/>
+                <ref bean="check_future"/>
+                <ref bean="check_saml2int"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>
diff --git a/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar b/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar
index 8850de41..84721d55 100644
Binary files a/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar and b/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar differ