diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index a7d371dc..120ea61d 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -45,6 +45,56 @@
     </bean>
     
 
+    <!--
+        *******************************************************************
+        ***                                                             ***
+        ***   S T R U C T U R E D   A G G R E G A T E   B U I L D E R   ***
+        ***                                                             ***
+        *******************************************************************
+    -->
+    
+    
+    <!--
+        Assemble a nested EntitiesDescriptor structure with the
+        UK federation entities inside an inner element.
+    -->
+    <bean id="uk_assembleStructuredAggregate" class="net.shibboleth.metadata.pipeline.CompositeStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="uk_assembleStructuredAggregate"/>
+        <property name="composedStages">
+            <list>
+                <!--
+                    Step 1: put all UK entities inside a UK-named EntitiesDescriptor
+                -->
+                <bean id="uk_buildNestedEntitiesDescriptor" class="net.shibboleth.metadata.pipeline.SplitMergeStage"
+                    init-method="initialize" lazy-init="true">
+                    <property name="id" value="uk_buildNestedEntitiesDescriptor"/>
+                    <property name="selectionStrategy">
+                        <bean class="uk.org.ukfederation.mda.UKEntitySelectionStrategy"/>
+                    </property>
+                    <property name="selectedItemPipeline">
+                        <bean name="uk_assemblePipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+                            init-method="initialize" lazy-init="true">
+                            <property name="id" value="uk_assemblePipeline"/>
+                            <property name="stages">
+                                <list>
+                                    <ref bean="uk_assemble"/>
+                                </list>
+                            </property>
+                        </bean>
+                    </property>
+                </bean>
+                
+                <!--
+                    Step 2: put that EntitiesDescriptor plus all remaining entities inside an
+                    anonymous outer EntitiesDescriptor.
+                -->
+                <ref bean="assemble"/>
+            </list>
+        </property>
+    </bean>
+
+
     <!--
         ***************************************************
         ***                                             ***
diff --git a/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar b/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar
index d31778af..e5d2c3c4 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