diff --git a/maven-model/maven.mdo.new b/maven-model/maven.mdo.new
index 31cba04288..e3e3d22aba 100644
--- a/maven-model/maven.mdo.new
+++ b/maven-model/maven.mdo.new
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
  |
  | o add specification element to a field, this would be more a technical description of
@@ -193,108 +194,6 @@
           <type>String</type>
           <comment>This naming is inconsistent and distriubtion should occur from a repository structure.</comment>
         </field>
-        <field>
-          <name>repositories</name>
-          <version>4.0.0</version>
-          <description>The lists of the remote repositories</description>
-          <type>java.util.List</type>
-          <defaultValue>new ArrayList()</defaultValue>
-        </field>
-
-        <field>
-          <name>mailingLists</name>
-          <version>3.0.0+</version>
-          <description>The mailing lists for the project.</description>
-          <type>java.util.List</type>
-          <defaultValue>new ArrayList()</defaultValue>
-        </field>
-        <field>
-          <name>developers</name>
-          <version>3.0.0+</version>
-          <description>
-            This element describes all of the developers associated with a
-            project.  Each developer is described by a
-            <code>developer</code> element, which is then described by
-            additional elements (described below).  The auto-generated site
-            documentation references this information.
-          </description>
-          <type>java.util.List</type>
-          <defaultValue>new ArrayList()</defaultValue>
-        </field>
-        <field>
-          <name>contributors</name>
-          <version>3.0.0+</version>
-          <description>
-            This element describes all of the contributors associated with a
-            project who are not developers.  Each contributor is described by a
-            <code>contributor</code> element, which is then describe by additional
-            elements (described below).  The auto-generated site documentation
-            references this information.
-          </description>
-          <type>java.util.List</type>
-          <defaultValue>new ArrayList()</defaultValue>
-        </field>
-        <field>
-          <name>dependencies</name>
-          <version>3.0.0+</version>
-          <description>
-            This element describes all of the dependencies associated with a
-            project.  Each dependency is described by a
-            <code>dependency</code> element, which is then described by
-            additional elements (described below).
-          </description>
-          <type>java.util.List</type>
-          <defaultValue>new ArrayList()</defaultValue>
-          <comment>These should ultimately only be compile time dependencies when transitive dependencies come into play.</comment>
-        </field>
-        <field>
-          <name>licenses</name>
-          <version>3.0.0+</version>
-          <description>
-            This element describes all of the licenses for this project.  Each license is described by a
-            <code>license</code> element, which is then describe by additional
-            elements (described below).  The auto-generated site documentation
-            references this information.  Projects should only list the license(s) that
-            applies to the project and not the licenses that apply to dependencies.
-          </description>
-          <type>java.util.List</type>
-          <defaultValue>new ArrayList()</defaultValue>
-        </field>
-        <field>
-          <name>versions</name>
-          <version>3.0.0</version>
-          <description>The released versions of the project.</description>
-          <type>java.util.List</type>
-          <defaultValue>new ArrayList()</defaultValue>
-        </field>
-        <field>
-          <name>branches</name>
-          <version>3.0.0</version>
-          <description>The SCM branches create for the project.</description>
-          <type>java.util.List</type>
-          <defaultValue>new ArrayList()</defaultValue>
-        </field>
-        <field>
-          <name>packageGroups</name>
-          <version>3.0.0+</version>
-          <description>Package groups required for complete javadocs.</description>
-          <type>java.util.List</type>
-          <defaultValue>new ArrayList()</defaultValue>
-        </field>
-        <field>
-          <name>reports</name>
-          <version>3.0.0+</version>
-          <description>
-            This element includes the specification of reports to be
-            included in a Maven-generated site.  These reports will be run
-            when a user executes
-            <code>maven site</code>.  All of the
-            reports will be included in the navigation bar for browsing in
-            the order they are specified.
-          </description>
-          <type>java.util.List</type>
-          <defaultValue>new ArrayList()</defaultValue>
-        </field>
         <field>
           <name>scm</name>
           <version>4.0.0</version>
@@ -332,6 +231,99 @@
           <type>DistributionManagement</type>
         </field>
       </fields>
+      <associations>
+        <association>
+          <name>repositories</name>
+          <version>4.0.0</version>
+          <description>The lists of the remote repositories</description>
+          <to>Repository</to>
+        </association>
+        <association>
+          <name>mailingLists</name>
+          <version>3.0.0+</version>
+          <description>The mailing lists for the project.</description>
+          <to>MailingList</to>
+        </association>
+        <association>
+          <name>developers</name>
+          <version>3.0.0+</version>
+          <description>
+            This element describes all of the developers associated with a
+            project.  Each developer is described by a
+            <code>developer</code> element, which is then described by
+            additional elements (described below).  The auto-generated site
+            documentation references this information.
+          </description>
+          <to>Developer</to>
+        </association>
+        <association>
+          <name>contributors</name>
+          <version>3.0.0+</version>
+          <description>
+            This element describes all of the contributors associated with a
+            project who are not developers.  Each contributor is described by a
+            <code>contributor</code> element, which is then describe by additional
+            elements (described below).  The auto-generated site documentation
+            references this information.
+          </description>
+          <to>Contributor</to>
+        </association>
+        <association>
+          <name>dependencies</name>
+          <version>3.0.0+</version>
+          <description>
+            This element describes all of the dependencies associated with a
+            project.  Each dependency is described by a
+            <code>dependency</code> element, which is then described by
+            additional elements (described below).
+          </description>
+          <comment>These should ultimately only be compile time dependencies when transitive dependencies come into play.</comment>
+          <to>Dependency</to>
+        </association>
+        <association>
+          <name>licenses</name>
+          <version>3.0.0+</version>
+          <description>
+            This element describes all of the licenses for this project.  Each license is described by a
+            <code>license</code> element, which is then describe by additional
+            elements (described below).  The auto-generated site documentation
+            references this information.  Projects should only list the license(s) that
+            applies to the project and not the licenses that apply to dependencies.
+          </description>
+          <to>License</to>
+        </association>
+        <association>
+          <name>versions</name>
+          <version>3.0.0</version>
+          <description>The released versions of the project.</description>
+          <to>Version</to>
+        </association>
+        <association>
+          <name>branches</name>
+          <version>3.0.0</version>
+          <description>The SCM branches create for the project.</description>
+          <to>Branch</to>
+        </association>
+        <association>
+          <name>packageGroups</name>
+          <version>3.0.0+</version>
+          <description>Package groups required for complete javadocs.</description>
+          <to>PackageGroup</to>
+        </association>
+        <association>
+          <name>reports</name>
+          <version>3.0.0+</version>
+          <description>
+            This element includes the specification of reports to be
+            included in a Maven-generated site.  These reports will be run
+            when a user executes
+            <code>maven site</code>.  All of the
+            reports will be included in the navigation bar for browsing in
+            the order they are specified.
+          </description>
+          <to>String</to>
+        </association>
+      </associations>
       <!-- We need this because we can't use package as a field name. -->
       <codeSegments>
         <codeSegment>
@@ -479,21 +471,6 @@
           </description>
           <type>String</type>
         </field>
-        <field>
-          <name>sourceModifications</name>
-          <version>3.0.0+</version>
-          <required>true</required>
-          <description>
-            This element describes all of the sourceModifications associated with a
-            project.  Each source modification is described by a
-            <code>sourceModification</code> element, which is then described by
-            additional elements (described below).  These modifications are used
-            to exclude or include various source depending on the environment
-            the build is running in.
-          </description>
-          <type>java.util.List</type>
-          <defaultValue>new ArrayList()</defaultValue>
-        </field>
         <field>
           <name>unitTest</name>
           <version>3.0.0+</version>
@@ -502,19 +479,6 @@
           <type>UnitTest</type>
           <defaultValue>new UnitTest()</defaultValue>
         </field>
-        <field>
-          <name>resources</name>
-          <version>3.0.0+</version>
-          <description>
-            This element describes all of the resources associated with a project or unit tests.
-            Each resource is described by a resource element, which is then described by additional
-            elements (described
-            <a href="#resource">below</a>). These resources are used to
-            complete the jar file or to run unit test.
-          </description>
-          <type>java.util.List</type>
-          <defaultValue>new ArrayList()</defaultValue>
-        </field>
         <field>
           <name>directory</name>
           <version>4.0.0</version>
@@ -540,6 +504,36 @@
           <type>String</type>
         </field>
       </fields>
+      <associations>
+        <association>
+          <name>sourceModifications</name>
+          <version>3.0.0+</version>
+	  <!--
+          <required>true</required>
+	  -->
+          <description>
+            This element describes all of the sourceModifications associated with a
+            project.  Each source modification is described by a
+            <code>sourceModification</code> element, which is then described by
+            additional elements (described below).  These modifications are used
+            to exclude or include various source depending on the environment
+            the build is running in.
+          </description>
+          <to>SourceModification</to>
+        </association>
+        <association>
+          <name>resources</name>
+          <version>3.0.0+</version>
+          <description>
+            This element describes all of the resources associated with a project or unit tests.
+            Each resource is described by a resource element, which is then described by additional
+            elements (described
+            <a href="#resource">below</a>). These resources are used to
+            complete the jar file or to run unit test.
+          </description>
+          <to>Resource</to>
+        </association>
+      </associations>
     </class>
     <class>
       <name>CiManagement</name>
@@ -593,18 +587,6 @@
           <description>The organization to which the contributor belongs.</description>
           <type>String</type>
         </field>
-        <field>
-          <name>roles</name>
-          <version>3.0.0+</version>
-          <description>
-            The roles the contributor plays in the project.  Each role is
-            describe by a
-            <code>role</code> element, the body of which is a
-            role name.
-          </description>
-          <type>java.util.List</type>
-          <defaultValue>new ArrayList()</defaultValue>
-        </field>
         <field>
           <name>timezone</name>
           <version>3.0.0+</version>
@@ -614,6 +596,19 @@
           <type>String</type>
         </field>
       </fields>
+      <associations>
+        <association>
+          <name>roles</name>
+          <version>3.0.0+</version>
+          <description>
+            The roles the contributor plays in the project.  Each role is
+            describe by a
+            <code>role</code> element, the body of which is a
+            role name.
+          </description>
+	  <to>String</to>
+        </association>
+      </associations>
     </class>
     <class>
       <name>Dependency</name>
@@ -691,7 +686,10 @@
           <type>String</type>
           <defaultValue>jar</defaultValue>
         </field>
-        <field>
+      </fields>
+      <associations>
+<!-- Trygve: Properties is a TODO in modello
+        <association>
           <name>properties</name>
           <version>3.0.0+</version>
           <description>
@@ -702,10 +700,10 @@
             in
             <code>WEB-INF/lib</code>. For example syntax, check the war plugin docs.
           </description>
-          <type>java.util.Properties</type>
-          <defaultValue>new Properties()</defaultValue>
-        </field>
-      </fields>
+          <to>java.util.Properties</to>
+        </association>
+-->
+      </associations>
       <codeSegments>
         <codeSegment>
           <version>4.0.0</version>
@@ -919,22 +917,20 @@
     <class>
       <name>PatternSet</name>
       <version>3.0.0+</version>
-      <fields>
-        <field>
+      <associations>
+        <association>
           <name>includes</name>
           <version>3.0.0+</version>
           <description>the description</description>
-          <type>java.util.List</type>
-          <defaultValue>new ArrayList()</defaultValue>
-        </field>
-        <field>
+	  <to>String</to>
+        </association>
+        <association>
           <name>excludes</name>
           <version>3.0.0+</version>
           <description>the description</description>
-          <type>java.util.List</type>
-          <defaultValue>new ArrayList()</defaultValue>
-        </field>
-      </fields>
+	  <to>String</to>
+        </association>
+      </associations>
       <codeSegments>
         <codeSegment>
           <version>3.0.0+</version>
@@ -1128,15 +1124,14 @@
       <name>UnitTest</name>
       <version>3.0.0+</version>
       <superClass>PatternSet</superClass>
-      <fields>
-        <field>
+      <associations>
+        <association>
           <name>resources</name>
           <version>3.0.0+</version>
           <description>the description</description>
-          <type>java.util.List</type>
-          <defaultValue>new ArrayList()</defaultValue>
-        </field>
-      </fields>
+          <to>Resource</to>
+        </association>
+      </associations>
     </class>
     <class>
       <name>Version</name>