diff --git a/proposal/myrmidon/antlib.xml b/proposal/myrmidon/antlib.xml
index 75e7287f4..6b70d9fe2 100644
--- a/proposal/myrmidon/antlib.xml
+++ b/proposal/myrmidon/antlib.xml
@@ -29,6 +29,7 @@ Legal:
   <property name="antlib.name" value="NONAME"/>
   <property name="antlib.include" value="org/apache/antlib/${antlib.name}/**"/>
   <property name="antlib.descriptor" value="${antlib.name}-ant-descriptor.xml"/>
+  <property name="antlib.role.descriptor" value="${antlib.name}-ant-roles.xml"/>
 
   <path id="project.class.path">
     <pathelement path="${java.class.path}" />
@@ -58,7 +59,7 @@ Legal:
       <template templateFile="${manifest.dir}/core-ant-descriptor.template"
                 destinationfile="${antlib.descriptor}"/>
       <template templateFile="${manifest.dir}/builtin-ant-roles.template"
-                destinationfile="${antlib.name}-ant-roles.xml"/>
+                destinationfile="${antlib.role.descriptor}"/>
     </xdoclet>
   </target>
 
@@ -69,6 +70,9 @@ Legal:
       <zipfileset dir="${gen.dir}" fullpath="META-INF/ant-descriptor.xml">
         <include name="${antlib.descriptor}"/>
       </zipfileset>
+      <zipfileset dir="${gen.dir}" fullpath="META-INF/ant-roles.xml">
+        <include name="${antlib.role.descriptor}"/>
+      </zipfileset>
     </jar>
   </target>
 
diff --git a/proposal/myrmidon/src/manifest/core-ant-descriptor.template b/proposal/myrmidon/src/manifest/core-ant-descriptor.template
index 450580bd1..4778d6fbb 100644
--- a/proposal/myrmidon/src/manifest/core-ant-descriptor.template
+++ b/proposal/myrmidon/src/manifest/core-ant-descriptor.template
@@ -2,18 +2,27 @@
 
   <types>
 
-    <XDtClass:forAllClasses type="org.apache.myrmidon.api.AbstractTask" extent="hierarchy">
+    <XDtClass:forAllClasses type="org.apache.myrmidon.api.Task" extent="hierarchy">
       <XDtClass:ifHasClassTag tagName="ant:task">
         <task name="<XDtClass:classTagValue tagName="ant:task" paramName="name"/>"
               classname="<XDtClass:fullClassName/>"/>
       </XDtClass:ifHasClassTag>
     </XDtClass:forAllClasses>
 
+    <XDtClass:forAllClasses type="org.apache.myrmidon.framework.DataType" extent="hierarchy">
+      <XDtClass:ifHasClassTag tagName="ant:data-type">
+        <data-type name="<XDtClass:classTagValue tagName="ant:data-type" paramName="name"/>"
+              classname="<XDtClass:fullClassName/>"/>
+        <task name="<XDtClass:classTagValue tagName="ant:data-type" paramName="name"/>"
+              classname="org.apache.myrmidon.framework.TypeInstanceTask"/>
+      </XDtClass:ifHasClassTag>
+    </XDtClass:forAllClasses>
+
   </types>
 
   <converters>
 
-    <XDtClass:forAllClasses type="org.apache.myrmidon.converter.AbstractConverter">
+    <XDtClass:forAllClasses type="org.apache.myrmidon.converter.Converter">
       <XDtClass:ifHasClassTag tagName="ant:converter">
         <converter classname="<XDtClass:fullClassName/>"
                    source="<XDtClass:classTagValue tagName="ant:converter" paramName="source"/>"