diff --git a/build.xml b/build.xml
index ae2652dc..6431ab50 100644
--- a/build.xml
+++ b/build.xml
@@ -498,9 +498,6 @@
                     <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>
                 <syspropertyset>
                     <propertyset refid="mda.properties"/>
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 9593dd9c..d8fdb984 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -291,14 +291,9 @@
                 <!--
                     Inject scopes "pushed" to entities from the members.xml file.
                 -->
-                <bean id="scopes_inject" parent="XSLTransformationStage"
-                    p:XSLResource="classpath:uk/scopes_inject.xsl">
-                    <property name="transformParameters">
-                        <map>
-                            <entry key="members" value-ref="uk_members"/>
-                        </map>
-                    </property>
-                </bean>
+                <bean id="scopes_inject" parent="stage_parent"
+                    class="uk.org.ukfederation.mda.dom.saml.ScopeInjectionStage"
+                    p:members-ref="uk_members"/>
 
                 <ref bean="populateItemIds"/>
                 <ref bean="uk_populateIds"/>
diff --git a/mdx/uk/scopes_inject.xsl b/mdx/uk/scopes_inject.xsl
deleted file mode 100644
index b0f09c20..00000000
--- a/mdx/uk/scopes_inject.xsl
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	
-    scopes_inject.xsl
-    
-    Inject scopes "pushed" to entities from the members.xml file.
-    
--->
-<xsl:stylesheet version="1.0"
-	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:members="http://ukfederation.org.uk/2007/01/members"
-	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-	
-	xmlns:ukfxMembers="xalan://uk.org.ukfederation.members.Members"
-	extension-element-prefixes="ukfxMembers"
-	
-	xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	exclude-result-prefixes="members">
-	
-	<!--Force UTF-8 encoding for the output.-->
-	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
-	
-	<!--
-        Parameters.
-    -->
-	<xsl:param name="members"/>
-	
-	<!--
-        Extend the scope list contained within an IdP's entity-level Extensions element
-        with any outsourced scopes provided by the member list. 
-    -->
-	<xsl:template match="md:EntityDescriptor[md:IDPSSODescriptor]/md:Extensions">
-		<xsl:copy>
-			<!-- copy everything from within the original element -->
-			<xsl:apply-templates select="node()"/>
-			<!-- copy scopes from member outsource records -->
-			<xsl:variable name="entityID" select="ancestor::md:EntityDescriptor/@entityID"/>
-			<xsl:for-each select="ukfxMembers:scopesForEntity($members, $entityID)/shibmd:Scope">
-				<xsl:text>    </xsl:text>
-				<xsl:element name="shibmd:Scope">
-					<xsl:attribute name="regexp">false</xsl:attribute>
-					<xsl:value-of select="."/>
-				</xsl:element>
-				<xsl:text>&#10;    </xsl:text>
-			</xsl:for-each>
-		</xsl:copy>
-	</xsl:template>
-	
-	<!--
-        If an IdP's SSO or AA roles includes an Extensions element, add in
-        and any outsourced scopes provided by the member list.
-    -->
-	<xsl:template match="md:IDPSSODescriptor/md:Extensions |
-		md:AttributeAuthorityDescriptor/md:Extensions">
-		<xsl:copy>
-			<!-- copy everything from within the original element -->
-			<xsl:apply-templates select="node()"/>
-			<!-- copy scopes from member outsource records -->
-			<xsl:variable name="entityID" select="ancestor::md:EntityDescriptor/@entityID"/>
-			<xsl:for-each select="ukfxMembers:scopesForEntity($members, $entityID)/shibmd:Scope">
-				<xsl:text>    </xsl:text>
-				<xsl:element name="shibmd:Scope">
-					<xsl:attribute name="regexp">false</xsl:attribute>
-					<xsl:value-of select="."/>
-				</xsl:element>
-				<xsl:text>&#10;        </xsl:text>
-			</xsl:for-each>
-		</xsl:copy>
-	</xsl:template>
-	
-	<!--
-        *********************************************
-        ***                                       ***
-        ***   D E F A U L T   T E M P L A T E S   ***
-        ***                                       ***
-        *********************************************
-    -->
-	
-	
-	<!--By default, copy text blocks, comments and attributes unchanged.-->
-	<xsl:template match="text()|comment()|@*">
-		<xsl:copy/>
-	</xsl:template>
-	
-	<!--By default, copy all elements from the input to the output, along with their attributes and contents.-->
-	<xsl:template match="*">
-		<xsl:copy>
-			<xsl:apply-templates select="node()|@*"/>
-		</xsl:copy>
-	</xsl:template>
-	
-</xsl:stylesheet>
diff --git a/tools/ukf-mda/ukf-mda-0.9.2.jar b/tools/ukf-mda/ukf-mda-0.9.2.jar
deleted file mode 100644
index 02c68e3e..00000000
Binary files a/tools/ukf-mda/ukf-mda-0.9.2.jar and /dev/null differ
diff --git a/tools/ukf-mda/ukf-mda-0.9.3.jar b/tools/ukf-mda/ukf-mda-0.9.3.jar
new file mode 100644
index 00000000..f8807096
Binary files /dev/null and b/tools/ukf-mda/ukf-mda-0.9.3.jar differ
diff --git a/tools/ukf-mda/ukf-members-1.2.0.jar b/tools/ukf-mda/ukf-members-1.2.0.jar
new file mode 100644
index 00000000..1f55db2e
Binary files /dev/null and b/tools/ukf-mda/ukf-members-1.2.0.jar differ
diff --git a/tools/xalan/lib/ukf-members-1.1.0.jar b/tools/xalan/lib/ukf-members-1.1.0.jar
deleted file mode 100644
index 2fd5a75f..00000000
Binary files a/tools/xalan/lib/ukf-members-1.1.0.jar and /dev/null differ