diff --git a/mdx/aaf/aaf-import.xml b/mdx/aaf/aaf-import.xml
index 56f9c1d5..5c8d304a 100644
--- a/mdx/aaf/aaf-import.xml
+++ b/mdx/aaf/aaf-import.xml
@@ -31,6 +31,6 @@
         </property>
     </bean>
     
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>
+    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>
diff --git a/mdx/arnes/arnes-import.xml b/mdx/arnes/arnes-import.xml
index 6602e49f..84dd3760 100644
--- a/mdx/arnes/arnes-import.xml
+++ b/mdx/arnes/arnes-import.xml
@@ -31,6 +31,6 @@
         </property>
     </bean>
     
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>
+    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>
diff --git a/mdx/caf/caf-import.xml b/mdx/caf/caf-import.xml
index 89971fd1..fca9f1a6 100644
--- a/mdx/caf/caf-import.xml
+++ b/mdx/caf/caf-import.xml
@@ -31,6 +31,6 @@
         </property>
     </bean>
     
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>
+    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>
diff --git a/mdx/edugain/edugain-import.xml b/mdx/edugain/edugain-import.xml
index c1c8ba9f..232ff313 100644
--- a/mdx/edugain/edugain-import.xml
+++ b/mdx/edugain/edugain-import.xml
@@ -35,6 +35,6 @@
         </property>
     </bean>
     
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>
+    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>
diff --git a/mdx/edugate/edugate-import.xml b/mdx/edugate/edugate-import.xml
index 926c1321..b4b164d9 100644
--- a/mdx/edugate/edugate-import.xml
+++ b/mdx/edugate/edugate-import.xml
@@ -31,6 +31,6 @@
         </property>
     </bean>
     
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>
+    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>
diff --git a/mdx/incommon/incommon-import.xml b/mdx/incommon/incommon-import.xml
index a473bbb9..e9021063 100644
--- a/mdx/incommon/incommon-import.xml
+++ b/mdx/incommon/incommon-import.xml
@@ -31,6 +31,6 @@
         </property>
     </bean>
     
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>
+    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>
diff --git a/mdx/swamid/swamid-import.xml b/mdx/swamid/swamid-import.xml
index 060b07a0..b5020e1e 100644
--- a/mdx/swamid/swamid-import.xml
+++ b/mdx/swamid/swamid-import.xml
@@ -31,6 +31,6 @@
         </property>
     </bean>
     
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>
+    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>
diff --git a/mdx/switch/switch-import.xml b/mdx/switch/switch-import.xml
index 3ccf89bf..53b1993b 100644
--- a/mdx/switch/switch-import.xml
+++ b/mdx/switch/switch-import.xml
@@ -31,6 +31,6 @@
         </property>
     </bean>
     
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>
+    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>
diff --git a/mdx/uk/uk-collect.xml b/mdx/uk/uk-collect.xml
index 64d30749..a5de6643 100644
--- a/mdx/uk/uk-collect.xml
+++ b/mdx/uk/uk-collect.xml
@@ -53,6 +53,6 @@
         </property>
     </bean>
     
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>
+    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
 
 </beans>
diff --git a/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar b/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar
index 249f5ce7..8850de41 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