[Volute] r4016 - in trunk/projects/dm/vo-dml: . models/provenancedm

Volute commit messages volutecommits at g-vo.org
Fri May 5 15:01:22 CEST 2017


Author: kriebe
Date: Fri May  5 15:01:21 2017
New Revision: 4016

Log:
Latest version, still validation errors, but builds are successful

Added:
   trunk/projects/dm/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml.validation-report.txt
Modified:
   trunk/projects/dm/vo-dml/build.properties
   trunk/projects/dm/vo-dml/models/provenancedm/ProvenanceDM.html
   trunk/projects/dm/vo-dml/models/provenancedm/ProvenanceDM.png
   trunk/projects/dm/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml
   trunk/projects/dm/vo-dml/models/provenancedm/README.txt
   trunk/projects/dm/vo-dml/models/provenancedm/provenance.xmi

Modified: trunk/projects/dm/vo-dml/build.properties
==============================================================================
--- trunk/projects/dm/vo-dml/build.properties	Fri May  5 13:55:33 2017	(r4015)
+++ trunk/projects/dm/vo-dml/build.properties	Fri May  5 15:01:21 2017	(r4016)
@@ -15,7 +15,8 @@
 # which is added under ./xslt/libs/
 #
 #models=./models/ivoa,./models/source,./models/ds
-models=./models/source
+models=./models/provenancedm
+#../provenance/vo-dml
 #
 #--------------------------------------
 # when generating html: run_vo-dml2html
@@ -25,8 +26,8 @@
 # diagram of the model, with links from the boxes to the description in
 # the HTML documentation.
 # User MUST provide the full path to the executable
-#graphviz.path = /usr/bin/dot
-graphviz.path = "C:/Program Files (x86)/Graphviz2.38/bin/dot.exe"
+graphviz.path = /usr/bin/dot
+#graphviz.path = "C:/Program Files (x86)/Graphviz2.38/bin/dot.exe"
 
 #--------------------------------------
 # when generating schemas: run_vo-dml2xsd

Modified: trunk/projects/dm/vo-dml/models/provenancedm/ProvenanceDM.html
==============================================================================
--- trunk/projects/dm/vo-dml/models/provenancedm/ProvenanceDM.html	Fri May  5 13:55:33 2017	(r4015)
+++ trunk/projects/dm/vo-dml/models/provenancedm/ProvenanceDM.html	Fri May  5 15:01:21 2017	(r4016)
@@ -24,307 +24,141 @@
         </tr>
         <tr>
           <td>2.2</td>
-          <td>    <a href="#char">package: char</a></td>
-        </tr>
-        <tr>
-          <td>2.2.1</td>
-          <td>    <a href="#char.Char">objectType: Char</a></td>
-        </tr>
-        <tr>
-          <td>2.3</td>
-          <td>    <a href="#dataset">package: dataset</a></td>
-        </tr>
-        <tr>
-          <td>2.3.1</td>
-          <td>    <a href="#dataset.Collection">objectType: Collection</a></td>
-        </tr>
-        <tr>
-          <td>2.3.2</td>
-          <td>    <a href="#dataset.Contact">objectType: Contact</a></td>
-        </tr>
-        <tr>
-          <td>2.3.3</td>
-          <td>    <a href="#dataset.Contributor">objectType: Contributor</a></td>
-        </tr>
-        <tr>
-          <td>2.3.4</td>
-          <td>    <a href="#dataset.CreationType">enumeration: CreationType</a></td>
-        </tr>
-        <tr>
-          <td>2.3.5</td>
-          <td>    <a href="#dataset.Creator">objectType: Creator</a></td>
-        </tr>
-        <tr>
-          <td>2.3.6</td>
-          <td>    <a href="#dataset.Curation">objectType: Curation</a></td>
-        </tr>
-        <tr>
-          <td>2.3.7</td>
-          <td>    <a href="#dataset.DataID">objectType: DataID</a></td>
-        </tr>
-        <tr>
-          <td>2.3.8</td>
-          <td>    <a href="#dataset.DataModel">objectType: DataModel</a></td>
-        </tr>
-        <tr>
-          <td>2.3.9</td>
-          <td>    <a href="#dataset.DataProductType">enumeration: DataProductType</a></td>
-        </tr>
-        <tr>
-          <td>2.3.10</td>
-          <td>    <a href="#dataset.Dataset">objectType: Dataset</a></td>
-        </tr>
-        <tr>
-          <td>2.3.11</td>
-          <td>    <a href="#dataset.Publication">objectType: Publication</a></td>
-        </tr>
-        <tr>
-          <td>2.3.12</td>
-          <td>    <a href="#dataset.Publisher">objectType: Publisher</a></td>
-        </tr>
-        <tr>
-          <td>2.3.13</td>
-          <td>    <a href="#dataset.RightsType">enumeration: RightsType</a></td>
-        </tr>
-        <tr>
-          <td>2.3.14</td>
-          <td>    <a href="#dataset.SpectralBandType">enumeration: SpectralBandType</a></td>
-        </tr>
-        <tr>
-          <td>2.4</td>
-          <td>    <a href="#experiment">package: experiment</a></td>
-        </tr>
-        <tr>
-          <td>2.4.1</td>
-          <td>    <a href="#experiment.AstroTarget">objectType: AstroTarget</a></td>
-        </tr>
-        <tr>
-          <td>2.4.2</td>
-          <td>    <a href="#experiment.BaseTarget">objectType: BaseTarget</a></td>
-        </tr>
-        <tr>
-          <td>2.4.3</td>
-          <td>    <a href="#experiment.Characterisation">objectType: Characterisation</a></td>
-        </tr>
-        <tr>
-          <td>2.4.4</td>
-          <td>    <a href="#experiment.Derived">objectType: Derived</a></td>
-        </tr>
-        <tr>
-          <td>2.4.5</td>
-          <td>    <a href="#experiment.DerivedElement">objectType: DerivedElement</a></td>
-        </tr>
-        <tr>
-          <td>2.4.6</td>
-          <td>    <a href="#experiment.DerivedScalar">objectType: DerivedScalar</a></td>
-        </tr>
-        <tr>
-          <td>2.4.7</td>
-          <td>    <a href="#experiment.Facility">objectType: Facility</a></td>
-        </tr>
-        <tr>
-          <td>2.4.8</td>
-          <td>    <a href="#experiment.Instrument">objectType: Instrument</a></td>
-        </tr>
-        <tr>
-          <td>2.4.9</td>
-          <td>    <a href="#experiment.ObsConfig">objectType: ObsConfig</a></td>
-        </tr>
-        <tr>
-          <td>2.4.10</td>
-          <td>    <a href="#experiment.ObsDataset">objectType: ObsDataset</a></td>
-        </tr>
-        <tr>
-          <td>2.4.11</td>
-          <td>    <a href="#experiment.Observation">objectType: Observation</a></td>
-        </tr>
-        <tr>
-          <td>2.4.12</td>
-          <td>    <a href="#experiment.Proposal">objectType: Proposal</a></td>
-        </tr>
-        <tr>
-          <td>2.4.13</td>
-          <td>    <a href="#experiment.Target">objectType: Target</a></td>
-        </tr>
-        <tr>
-          <td>2.5</td>
           <td>    <a href="#ivoa">package: ivoa</a></td>
         </tr>
         <tr>
-          <td>2.5.1</td>
+          <td>2.2.1</td>
           <td>    <a href="#ivoa.IntegerQuantity">dataType: IntegerQuantity</a></td>
         </tr>
         <tr>
-          <td>2.5.2</td>
+          <td>2.2.2</td>
           <td>    <a href="#ivoa.Quantity">dataType: Quantity</a></td>
         </tr>
         <tr>
-          <td>2.5.3</td>
+          <td>2.2.3</td>
           <td>    <a href="#ivoa.RealQuantity">dataType: RealQuantity</a></td>
         </tr>
         <tr>
-          <td>2.5.4</td>
+          <td>2.2.4</td>
           <td>    <a href="#ivoa.Unit">primitiveType: Unit</a></td>
         </tr>
         <tr>
-          <td>2.5.5</td>
+          <td>2.2.5</td>
           <td>    <a href="#ivoa.anyURI">primitiveType: anyURI</a></td>
         </tr>
         <tr>
-          <td>2.5.6</td>
+          <td>2.2.6</td>
           <td>    <a href="#boolean">primitiveType: boolean</a></td>
         </tr>
         <tr>
-          <td>2.5.7</td>
+          <td>2.2.7</td>
           <td>    <a href="#complex">primitiveType: complex</a></td>
         </tr>
         <tr>
-          <td>2.5.8</td>
+          <td>2.2.8</td>
           <td>    <a href="#ivoa.datetime">primitiveType: datetime</a></td>
         </tr>
         <tr>
-          <td>2.5.9</td>
+          <td>2.2.9</td>
           <td>    <a href="#integer">primitiveType: integer</a></td>
         </tr>
         <tr>
-          <td>2.5.10</td>
+          <td>2.2.10</td>
           <td>    <a href="#ivoa.nonnegativeinteger">primitiveType: nonnegativeinteger</a></td>
         </tr>
         <tr>
-          <td>2.5.11</td>
+          <td>2.2.11</td>
           <td>    <a href="#rational">primitiveType: rational</a></td>
         </tr>
         <tr>
-          <td>2.5.12</td>
+          <td>2.2.12</td>
           <td>    <a href="#ivoa.real">primitiveType: real</a></td>
         </tr>
         <tr>
-          <td>2.5.13</td>
+          <td>2.2.13</td>
           <td>    <a href="#string">primitiveType: string</a></td>
         </tr>
         <tr>
-          <td>2.6</td>
-          <td>    <a href="#party">package: party</a></td>
-        </tr>
-        <tr>
-          <td>2.6.1</td>
-          <td>    <a href="#party.Individual">objectType: Individual</a></td>
-        </tr>
-        <tr>
-          <td>2.6.2</td>
-          <td>    <a href="#party.Organization">objectType: Organization</a></td>
-        </tr>
-        <tr>
-          <td>2.6.3</td>
-          <td>    <a href="#party.Party">objectType: Party</a></td>
-        </tr>
-        <tr>
-          <td>2.6.4</td>
-          <td>    <a href="#party.Role">objectType: Role</a></td>
-        </tr>
-        <tr>
-          <td>2.7</td>
+          <td>2.3</td>
           <td>    <a href="#provenance">package: provenance</a></td>
         </tr>
         <tr>
-          <td>2.7.1</td>
+          <td>2.3.1</td>
           <td>    <a href="#provenance.Activity">objectType: Activity</a></td>
         </tr>
         <tr>
-          <td>2.7.2</td>
+          <td>2.3.2</td>
           <td>    <a href="#provenance.ActivityDescription">objectType: ActivityDescription</a></td>
         </tr>
         <tr>
-          <td>2.7.3</td>
+          <td>2.3.3</td>
           <td>    <a href="#provenance.ActivityFlow">objectType: ActivityFlow</a></td>
         </tr>
         <tr>
-          <td>2.7.4</td>
+          <td>2.3.4</td>
           <td>    <a href="#provenance.Agent">objectType: Agent</a></td>
         </tr>
         <tr>
-          <td>2.7.5</td>
+          <td>2.3.5</td>
           <td>    <a href="#provenance.AgentRole">enumeration: AgentRole</a></td>
         </tr>
         <tr>
-          <td>2.7.6</td>
+          <td>2.3.6</td>
           <td>    <a href="#provenance.Collection">objectType: Collection</a></td>
         </tr>
         <tr>
-          <td>2.7.7</td>
+          <td>2.3.7</td>
           <td>    <a href="#provenance.Entity">objectType: Entity</a></td>
         </tr>
         <tr>
-          <td>2.7.8</td>
+          <td>2.3.8</td>
           <td>    <a href="#provenance.EntityDescription">objectType: EntityDescription</a></td>
         </tr>
         <tr>
-          <td>2.7.9</td>
+          <td>2.3.9</td>
           <td>    <a href="#provenance.HadMember">objectType: HadMember</a></td>
         </tr>
         <tr>
-          <td>2.7.10</td>
+          <td>2.3.10</td>
           <td>    <a href="#provenance.HadStep">objectType: HadStep</a></td>
         </tr>
         <tr>
-          <td>2.7.11</td>
+          <td>2.3.11</td>
           <td>    <a href="#provenance.Parameter">objectType: Parameter</a></td>
         </tr>
         <tr>
-          <td>2.7.12</td>
+          <td>2.3.12</td>
           <td>    <a href="#provenance.ParameterDescription">objectType: ParameterDescription</a></td>
         </tr>
         <tr>
-          <td>2.7.13</td>
+          <td>2.3.13</td>
           <td>    <a href="#provenance.Used">objectType: Used</a></td>
         </tr>
         <tr>
-          <td>2.7.14</td>
+          <td>2.3.14</td>
           <td>    <a href="#provenance.UsedDescription">objectType: UsedDescription</a></td>
         </tr>
         <tr>
-          <td>2.7.15</td>
+          <td>2.3.15</td>
           <td>    <a href="#provenance.WasAssociatedWith">objectType: WasAssociatedWith</a></td>
         </tr>
         <tr>
-          <td>2.7.16</td>
+          <td>2.3.16</td>
           <td>    <a href="#provenance.WasAttributedTo">objectType: WasAttributedTo</a></td>
         </tr>
         <tr>
-          <td>2.7.17</td>
+          <td>2.3.17</td>
           <td>    <a href="#provenance.WasGeneratedBy">objectType: WasGeneratedBy</a></td>
         </tr>
         <tr>
-          <td>2.7.18</td>
+          <td>2.3.18</td>
           <td>    <a href="#provenance.WasGeneratedByDescription">objectType: WasGeneratedByDescription</a></td>
         </tr>
         <tr>
-          <td>2.8</td>
-          <td>    <a href="#stc">package: stc</a></td>
-        </tr>
-        <tr>
-          <td>2.8.1</td>
-          <td>    <a href="#stc.AstroCoordSystem">objectType: AstroCoordSystem</a></td>
-        </tr>
-        <tr>
-          <td>2.8.2</td>
-          <td>    <a href="#stc.Position">dataType: Position</a></td>
-        </tr>
-        <tr>
           <td>3.</td>
           <td>
                 <a href="#vodml-ids">vodml-id-s</a></td>
         </tr>
-        <tr>
-          <td>4.</td>
-          <td>
-                <a href="#modelimports">Imported Models</a></td>
-        </tr>
-        <tr>
-          <td>4.1</td>
-          <td>
-                <a href="#ds">ds</a></td>
-        </tr>
       </table>
     </div>
     <hr>
@@ -338,7 +172,7 @@
       <tr>
         <td align="right"><b>Date</b></td>
         <td> : </td>
-        <td>2016-12-16T13:06:24</td>
+        <td>2017-05-05T14:57:41</td>
       </tr>
       <tr>
         <td align="right"><b>Version</b></td>
@@ -369,78 +203,39 @@
         <td colspan="3"></td>
       </tr>
     </table><img src="ProvenanceDM.png" usemap="#GVmap"><map id="GVmap" name="GVmap">
-<area shape="rect" id="node1" href="#ivoa" title="ivoa" alt="" coords="680,59,752,107"/>
-<area shape="rect" id="node2" href="#char" title="char" alt="" coords="584,59,656,107"/>
-<area shape="rect" id="node3" href="#stc" title="stc" alt="" coords="488,59,560,107"/>
-<area shape="rect" id="node4" href="#experiment" title="experiment" alt="" coords="357,59,464,107"/>
-<area shape="rect" id="node5" href="#dataset" title="dataset" alt="" coords="259,59,332,107"/>
-<area shape="rect" id="node6" href="#party" title="party" alt="" coords="163,59,235,107"/>
-<area shape="rect" id="node7" href="#provenance" title="provenance" alt="" coords="27,59,137,107"/>
-<area shape="rect" id="node8" href="#ivoa.real" title="{<<primitive type>>\nivoa/real}" alt="" coords="777,58,887,107"/>
-<area shape="rect" id="node9" href="#ivoa.nonnegativeinteger" title="{<<primitive type>>\nivoa/nonnegativeinteger}" alt="" coords="911,58,1045,107"/>
-<area shape="rect" id="node10" href="#ivoa.datetime" title="{<<primitive type>>\nivoa/datetime}" alt="" coords="1070,58,1180,107"/>
-<area shape="rect" id="node11" href="#ivoa.anyURI" title="{<<primitive type>>\nivoa/anyURI}" alt="" coords="1205,58,1315,107"/>
-<area shape="rect" id="node12" href="#ivoa.Unit" title="{<<primitive type>>\nivoa/Unit}" alt="" coords="1339,58,1449,107"/>
-<area shape="rect" id="node13" href="#string" title="{<<primitive type>>\nivoa/string}" alt="" coords="1474,58,1584,107"/>
-<area shape="rect" id="node14" href="#boolean" title="{<<primitive type>>\nivoa/boolean}" alt="" coords="1609,58,1719,107"/>
-<area shape="rect" id="node15" href="#complex" title="{<<primitive type>>\nivoa/complex}" alt="" coords="1743,58,1853,107"/>
-<area shape="rect" id="node16" href="#rational" title="{<<primitive type>>\nivoa/rational}" alt="" coords="1878,58,1988,107"/>
-<area shape="rect" id="node17" href="#integer" title="{<<primitive type>>\nivoa/integer}" alt="" coords="2013,58,2123,107"/>
-<area shape="rect" id="node18" href="#ivoa.Quantity" title="{<<datatype>>\nivoa/Quantity|+unit : provenance:ivoa.Unit\l}" alt="" coords="2188,236,2341,295"/>
-<area shape="rect" id="node19" href="#ivoa.IntegerQuantity" title="{<<datatype>>\nivoa/IntegerQuantity|+value : \l}" alt="" coords="2147,53,2265,112"/>
-<area shape="rect" id="node20" href="#ivoa.RealQuantity" title="{<<datatype>>\nivoa/RealQuantity|+value : provenance:ivoa.real\l}" alt="" coords="2290,53,2448,112"/>
-<area shape="rect" id="node21" href="#char.Char" title="{char/Char}" alt="" coords="2701,535,2773,585"/>
-<area shape="rect" id="node22" href="#stc.Position" title="{<<datatype>>\nstc/Position}" alt="" coords="2708,58,2793,107"/>
-<area shape="rect" id="node23" href="#stc.AstroCoordSystem" title="{stc/AstroCoordSystem}" alt="" coords="2837,382,2960,431"/>
-<area shape="rect" id="node24" href="#experiment.Observation" title="{experiment/Observation|+observationID : \l}" alt="" coords="2551,58,2684,107"/>
-<area shape="rect" id="node25" href="#experiment.ObsConfig" title="{experiment/ObsConfig|+bandpass : \l+datasource : \l}" alt="" coords="2369,377,2495,436"/>
-<area shape="rect" id="node26" href="#experiment.BaseTarget" title="{experiment/BaseTarget|+name : \l+description : \l+position : provenance:stc.Position\l}" alt="" coords="3645,371,3827,442"/>
-<area shape="rect" id="node31" href="#experiment.Proposal" title="{experiment/Proposal|+identifier : \l}" alt="" coords="2520,382,2636,431"/>
-<area shape="rect" id="node34" href="#experiment.ObsDataset" title="{experiment/ObsDataset|+calibLevel : \l}" alt="" coords="2788,241,2916,290"/>
-<area shape="rect" id="node29" href="#experiment.Facility" title="{experiment/Facility}" alt="" coords="2470,678,2580,727"/>
-<area shape="rect" id="node30" href="#experiment.Instrument" title="{experiment/Instrument|+name : \l}" alt="" coords="2350,535,2476,585"/>
-<area shape="rect" id="node27" href="#experiment.Target" title="{experiment/Target|+objectClass : \l}" alt="" coords="3737,241,3844,290"/>
-<area shape="rect" id="node28" href="#experiment.AstroTarget" title="{experiment/AstroTarget|+objectClass : \l+spectralClass : \l+redshift : provenance:ivoa.real\l+varAmpl : provenance:ivoa.real\l}" alt="" coords="3458,224,3632,307"/>
-<area shape="rect" id="node52" href="#party.Role" title="{party/Role}" alt="" coords="2856,815,2928,865"/>
-<area shape="rect" id="node54" href="#party.Organization" title="{party/Organization|+address : \l+phone : \l+email : \l+logo : provenance:ivoa.anyURI\l}" alt="" coords="2487,799,2661,881"/>
-<area shape="rect" id="node32" href="#experiment.Characterisation" title="{experiment/Characterisation}" alt="" coords="2662,382,2812,431"/>
-<area shape="rect" id="node33" href="#experiment.Derived" title="{experiment/Derived}" alt="" coords="3505,382,3620,431"/>
-<area shape="rect" id="node35" href="#experiment.DerivedElement" title="{experiment/DerivedElement}" alt="" coords="3328,535,3480,585"/>
-<area shape="rect" id="node42" href="#dataset.Dataset" title="{dataset/Dataset|+dataProductType : provenance:dataset.DataProductType\l+dataProductSubtype : \l}" alt="" coords="2985,377,3273,436"/>
-<area shape="rect" id="node36" href="#experiment.DerivedScalar" title="{experiment/DerivedScalar|+name : \l+value : provenance:ivoa.Quantity\l}" alt="" coords="3298,377,3480,436"/>
-<area shape="rect" id="node37" href="#dataset.DataProductType" title="{<<enumeration>>\ldataset/DataProductType|+CUBE\l+IMAGE\l+PHOTOMETRY\l+SPECTRUM\l+TIMESERIES\l+SED\l+VISIBILITY\l+EVENT\l+CATALOG\l}" alt="" coords="2818,5,2955,160"/>
-<area shape="rect" id="node38" href="#dataset.CreationType" title="{<<enumeration>>\ldataset/CreationType|+ARCHIVAL\l+CUTOUT\l+FILTERED\l+MOSAIC\l+SPECTRAL_EXTRACTION\l+CATALOG_EXTRACTION\l}" alt="" coords="2980,23,3139,142"/>
-<area shape="rect" id="node39" href="#dataset.RightsType" title="{<<enumeration>>\ldataset/RightsType|+PUBLIC\l+PROPRIETARY\l+SECURE\l}" alt="" coords="3164,41,3273,124"/>
-<area shape="rect" id="node40" href="#dataset.SpectralBandType" title="{<<enumeration>>\ldataset/SpectralBandType|+RADIO\l+MILLIMETER\l+INFRARED\l+OPTICAL\l+ULTRAVIOLET\l+XRAY\l+GAMMARAY\l}" alt="" coords="3297,17,3437,148"/>
-<area shape="rect" id="node41" href="#dataset.DataModel" title="{dataset/DataModel|+name : \l+prefix : \l+URL : provenance:ivoa.anyURI\l}" alt="" coords="3463,47,3637,118"/>
-<area shape="rect" id="node43" href="#dataset.DataID" title="{dataset/DataID|+title : \l+datasetID : provenance:ivoa.anyURI\l+creatorDID : provenance:ivoa.anyURI\l+version : \l+date : provenance:ivoa.datetime\l+creationType : provenance:dataset.CreationType\l}" alt="" coords="3047,507,3299,613"/>
-<area shape="rect" id="node44" href="#dataset.Curation" title="{dataset/Curation|+publisherDID : provenance:ivoa.anyURI\l+version : \l+releaseDate : provenance:ivoa.datetime\l+rights : provenance:dataset.RightsType\l}" alt="" coords="2799,519,3015,601"/>
-<area shape="rect" id="node47" href="#dataset.Creator" title="{dataset/Creator}" alt="" coords="3225,678,3316,727"/>
-<area shape="rect" id="node48" href="#dataset.Contributor" title="{dataset/Contributor|+acknowledgment : \l}" alt="" coords="3085,678,3200,727"/>
-<area shape="rect" id="node50" href="#dataset.Collection" title="{dataset/Collection|+name : \l}" alt="" coords="3341,678,3443,727"/>
-<area shape="rect" id="node45" href="#dataset.Publisher" title="{dataset/Publisher|+publisherID : provenance:ivoa.anyURI\l}" alt="" coords="2852,678,3060,727"/>
-<area shape="rect" id="node46" href="#dataset.Contact" title="{dataset/Contact}" alt="" coords="2737,678,2828,727"/>
-<area shape="rect" id="node49" href="#dataset.Publication" title="{dataset/Publication|+refCode : \l}" alt="" coords="2605,678,2712,727"/>
-<area shape="rect" id="node53" href="#party.Individual" title="{party/Individual|+address : \l+phone : \l+email : \l}" alt="" coords="2734,805,2831,875"/>
-<area shape="rect" id="node51" href="#party.Party" title="{party/Party|+name : \l}" alt="" coords="2754,987,2827,1037"/>
-<area shape="rect" id="node55" href="#provenance.AgentRole" title="{<<enumeration>>\lprovenance/AgentRole|+Observer\l+Creator\l+Author\l+Editor\l+Publisher\l+Operator\l+Coordinator\l+Provider\l}" alt="" coords="3663,11,3791,154"/>
-<area shape="rect" id="node56" href="#provenance.Activity" title="{provenance/Activity|+id : provenance:string\l+label : provenance:string\l+startTime : provenance:string\l+endTime : provenance:string\l+annotation : provenance:string\l}" alt="" coords="3417,793,3585,887"/>
-<area shape="rect" id="node57" href="#provenance.ActivityDescription" title="{provenance/ActivityDescription|+id : provenance:string\l+label : provenance:string\l+type : provenance:string\l+subtype : provenance:string\l+description : provenance:string\l+docuLink : provenance:ivoa.anyURI\l}" alt="" coords="3491,959,3689,1065"/>
-<area shape="rect" id="node60" href="#provenance.Used" title="{provenance/Used}" alt="" coords="4010,987,4112,1037"/>
-<area shape="rect" id="node61" href="#provenance.WasGeneratedBy" title="{provenance/WasGeneratedBy}" alt="" coords="3714,987,3872,1037"/>
-<area shape="rect" id="node64" href="#provenance.WasAssociatedWith" title="{provenance/WasAssociatedWith|+role : provenance:provenance.AgentRole\l}" alt="" coords="2855,987,3073,1037"/>
-<area shape="rect" id="node70" href="#provenance.Parameter" title="{provenance/Parameter|+id : \l+value : \l}" alt="" coords="3341,983,3467,1041"/>
-<area shape="rect" id="node62" href="#provenance.WasGeneratedByDescription" title="{provenance/WasGeneratedByDescription|+role : provenance:string\l}" alt="" coords="3671,1171,3880,1221"/>
-<area shape="rect" id="node71" href="#provenance.ParameterDescription" title="{provenance/ParameterDescription|+id : provenance:string\l+label : provenance:string\l+annotation : provenance:string\l+datatype : provenance:string\l+unit : provenance:ivoa.Unit\l+ucd : provenance:string\l+utype : provenance:string\l}" alt="" coords="3280,1137,3459,1255"/>
-<area shape="rect" id="node72" href="#provenance.UsedDescription" title="{provenance/UsedDescription|+role : provenance:string\l}" alt="" coords="4004,1171,4157,1221"/>
-<area shape="rect" id="node58" href="#provenance.Entity" title="{provenance/Entity|+id : provenance:string\l+label : provenance:string\l+type : provenance:string\l+annotation : provenance:string\l+access : provenance:string\l}" alt="" coords="3915,793,4084,887"/>
-<area shape="rect" id="node59" href="#provenance.EntityDescription" title="{provenance/EntityDescription|+id : provenance:string\l+label : provenance:string\l+annotation : provenance:string\l+dataproduct_type : provenance:string\l+dataproduct_subtype : provenance:string\l+level : provenance:integer\l+docu_link : provenance:ivoa.anyURI\l}" alt="" coords="4206,953,4423,1071"/>
-<area shape="rect" id="node65" href="#provenance.WasAttributedTo" title="{provenance/WasAttributedTo|+role : provenance:provenance.AgentRole\l}" alt="" coords="3099,987,3317,1037"/>
-<area shape="rect" id="node63" href="#provenance.Agent" title="{provenance/Agent|+id : provenance:string\l+name : provenance:string\l}" alt="" coords="2953,811,3097,869"/>
-<area shape="rect" id="node66" href="#provenance.ActivityFlow" title="{provenance/ActivityFlow}" alt="" coords="3505,535,3644,585"/>
-<area shape="rect" id="node68" href="#provenance.HadStep" title="{provenance/HadStep}" alt="" coords="3533,678,3651,727"/>
-<area shape="rect" id="node67" href="#provenance.Collection" title="{provenance/Collection}" alt="" coords="3937,535,4063,585"/>
-<area shape="rect" id="node69" href="#provenance.HadMember" title="{provenance/HadMember}" alt="" coords="4001,678,4137,727"/>
+<area shape="rect" id="node1" href="#ivoa" title="ivoa" alt="" coords="156,57,228,105"/>
+<area shape="rect" id="node2" href="#provenance" title="provenance" alt="" coords="26,57,131,105"/>
+<area shape="rect" id="node3" href="#ivoa.real" title="{<<primitive type>>\nivoa/real}" alt="" coords="252,57,359,106"/>
+<area shape="rect" id="node4" href="#ivoa.nonnegativeinteger" title="{<<primitive type>>\nivoa/nonnegativeinteger}" alt="" coords="383,57,507,106"/>
+<area shape="rect" id="node5" href="#ivoa.datetime" title="{<<primitive type>>\nivoa/datetime}" alt="" coords="532,57,639,106"/>
+<area shape="rect" id="node6" href="#ivoa.anyURI" title="{<<primitive type>>\nivoa/anyURI}" alt="" coords="663,57,769,106"/>
+<area shape="rect" id="node7" href="#ivoa.Unit" title="{<<primitive type>>\nivoa/Unit}" alt="" coords="793,57,900,106"/>
+<area shape="rect" id="node8" href="#string" title="{<<primitive type>>\nivoa/string}" alt="" coords="924,57,1031,106"/>
+<area shape="rect" id="node9" href="#boolean" title="{<<primitive type>>\nivoa/boolean}" alt="" coords="1055,57,1161,106"/>
+<area shape="rect" id="node10" href="#complex" title="{<<primitive type>>\nivoa/complex}" alt="" coords="1185,57,1292,106"/>
+<area shape="rect" id="node11" href="#rational" title="{<<primitive type>>\nivoa/rational}" alt="" coords="1316,57,1423,106"/>
+<area shape="rect" id="node12" href="#integer" title="{<<primitive type>>\nivoa/integer}" alt="" coords="1447,57,1553,106"/>
+<area shape="rect" id="node13" href="#ivoa.Quantity" title="{<<datatype>>\nivoa/Quantity|+unit : provenance:ivoa.Unit\l}" alt="" coords="1638,215,1783,274"/>
+<area shape="rect" id="node14" href="#ivoa.IntegerQuantity" title="{<<datatype>>\nivoa/IntegerQuantity|+value : \l}" alt="" coords="1578,52,1689,111"/>
+<area shape="rect" id="node15" href="#ivoa.RealQuantity" title="{<<datatype>>\nivoa/RealQuantity|+value : provenance:ivoa.real\l}" alt="" coords="1713,52,1863,111"/>
+<area shape="rect" id="node16" href="#provenance.AgentRole" title="{<<enumeration>>\lprovenance/AgentRole|+Observer\l+Creator\l+Author\l+Editor\l+Publisher\l+Operator\l+Coordinator\l+Provider\l}" alt="" coords="1888,10,2008,153"/>
+<area shape="rect" id="node17" href="#provenance.Activity" title="{provenance/Activity|+id : provenance:string\l+name : provenance:string\l+startTime : provenance:string\l+endTime : provenance:string\l+annotation : provenance:string\l}" alt="" coords="2019,337,2176,431"/>
+<area shape="rect" id="node18" href="#provenance.ActivityDescription" title="{provenance/ActivityDescription|+id : provenance:string\l+name : provenance:string\l+type : provenance:string\l+subtype : provenance:string\l+description : provenance:string\l+doculink : provenance:ivoa.anyURI\l}" alt="" coords="1870,494,2050,601"/>
+<area shape="rect" id="node21" href="#provenance.Used" title="{provenance/Used|+role : provenance:string\l}" alt="" coords="2075,523,2205,572"/>
+<area shape="rect" id="node22" href="#provenance.WasGeneratedBy" title="{provenance/WasGeneratedBy|+role : provenance:string\l}" alt="" coords="2330,523,2481,572"/>
+<area shape="rect" id="node25" href="#provenance.WasAssociatedWith" title="{provenance/WasAssociatedWith|+role : provenance:provenance.AgentRole\l}" alt="" coords="2709,523,2913,572"/>
+<area shape="rect" id="node31" href="#provenance.Parameter" title="{provenance/Parameter|+id : \l+value : \l}" alt="" coords="1677,518,1795,577"/>
+<area shape="rect" id="node23" href="#provenance.WasGeneratedByDescription" title="{provenance/WasGeneratedByDescription|+role : provenance:string\l}" alt="" coords="2307,698,2507,747"/>
+<area shape="rect" id="node32" href="#provenance.ParameterDescription" title="{provenance/ParameterDescription|+id : provenance:string\l+name : provenance:string\l+annotation : provenance:string\l+datatype : provenance:string\l+unit : provenance:ivoa.Unit\l+ucd : provenance:string\l+utype : provenance:string\l}" alt="" coords="1673,663,1842,782"/>
+<area shape="rect" id="node33" href="#provenance.UsedDescription" title="{provenance/UsedDescription|+role : provenance:string\l}" alt="" coords="2025,698,2172,747"/>
+<area shape="rect" id="node19" href="#provenance.Entity" title="{provenance/Entity|+id : provenance:string\l+name : provenance:string\l+type : provenance:string\l+annotation : provenance:string\l+rights : provenance:string\l}" alt="" coords="2456,337,2613,431"/>
+<area shape="rect" id="node20" href="#provenance.EntityDescription" title="{provenance/EntityDescription|+id : provenance:string\l+name : provenance:string\l+annotation : provenance:string\l+category : provenance:string\l+doculink : provenance:ivoa.anyURI\l}" alt="" coords="2505,500,2685,595"/>
+<area shape="rect" id="node26" href="#provenance.WasAttributedTo" title="{provenance/WasAttributedTo|+role : provenance:provenance.AgentRole\l}" alt="" coords="2937,523,3141,572"/>
+<area shape="rect" id="node24" href="#provenance.Agent" title="{provenance/Agent|+id : provenance:string\l+name : provenance:string\l}" alt="" coords="2889,355,3025,413"/>
+<area shape="rect" id="node27" href="#provenance.ActivityFlow" title="{provenance/ActivityFlow}" alt="" coords="2032,57,2163,106"/>
+<area shape="rect" id="node29" href="#provenance.HadStep" title="{provenance/HadStep}" alt="" coords="2101,220,2211,269"/>
+<area shape="rect" id="node28" href="#provenance.Collection" title="{provenance/Collection}" alt="" coords="2475,57,2594,106"/>
+<area shape="rect" id="node30" href="#provenance.HadMember" title="{provenance/HadMember}" alt="" coords="2536,220,2664,269"/>
 </map>
 
     <hr>
@@ -460,38 +255,43 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">child package(s)</td>
-        <td colspan="2" class="feature-detail"><a href="#char">char</a> <a href="#dataset">dataset</a> <a href="#experiment">experiment</a> <a href="#ivoa">ivoa</a> <a href="#party">party</a> <a href="#provenance">provenance</a> <a href="#stc">stc</a> 
+        <td colspan="2" class="feature-detail"><a href="#ivoa">ivoa</a> <a href="#provenance">provenance</a> 
         </td>
       </tr>
     </table>
-    <h3><a name="char"></a>2.2 package: char
+    <h3><a name="ivoa"></a>2.2 package: ivoa
     </h3>
     <table border="1" cellspacing="2" width="100%">
       <tr>
         <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">char</td>
+        <td class="objecttype-name" colspan="1">ivoa</td>
       </tr>
       <tr>
         <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">Characterisation Model V1.13 (2008)</td>
+        <td class="feature-detail" colspan="1">Base Data Types V1.0 (2014)</td>
       </tr>
       <tr>
         <td width="20%" class="info-title">parent</td>
         <td colspan="2" class="feature-detail"><a href="#model_section">provenance</a></td>
       </tr>
       <tr>
-        <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#char.Char">Char</a> 
+        <td width="20%" class="info-title">Data types</td>
+        <td colspan="2" class="feature-detail"><a href="#ivoa.IntegerQuantity">IntegerQuantity</a> <a href="#ivoa.Quantity">Quantity</a> <a href="#ivoa.RealQuantity">RealQuantity</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Primitive types</td>
+        <td colspan="2" class="feature-detail"><a href="#ivoa.Unit">Unit</a> <a href="#ivoa.anyURI">anyURI</a> <a href="#boolean">boolean</a> <a href="#complex">complex</a> <a href="#ivoa.datetime">datetime</a> <a href="#integer">integer</a> <a href="#ivoa.nonnegativeinteger">nonnegativeinteger</a> <a href="#rational">rational</a> <a href="#ivoa.real">real</a> <a href="#string">string</a> 
         </td>
       </tr>
     </table>
-    <h3><a name="char.Char"></a>2.2.1 objectType: Char
+    <h3><a name="ivoa.IntegerQuantity"></a>2.2.1 dataType: IntegerQuantity
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">char.Char</td>
+          <td class="objecttype-name" colspan="1">ivoa.IntegerQuantity</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -508,69 +308,11 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#char">char</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#experiment.Characterisation">Characterisation</a> 
-                      </td>
+                      <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
                     </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="dataset"></a>2.3 package: dataset
-    </h3>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">dataset</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">Dataset Metadata package</td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#model_section">provenance</a></td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#dataset.Collection">Collection</a> <a href="#dataset.Contact">Contact</a> <a href="#dataset.Contributor">Contributor</a> <a href="#dataset.Creator">Creator</a> <a href="#dataset.Curation">Curation</a> <a href="#dataset.DataID">DataID</a> <a href="#dataset.DataModel">DataModel</a> <a href="#dataset.Dataset">Dataset</a> <a href="#dataset.Publication">Publication</a> <a href="#dataset.Publisher">Publisher</a> 
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Enumerations</td>
-        <td colspan="2" class="feature-detail"><a href="#dataset.CreationType">CreationType</a> <a href="#dataset.DataProductType">DataProductType</a> <a href="#dataset.RightsType">RightsType</a> <a href="#dataset.SpectralBandType">SpectralBandType</a> 
-        </td>
-      </tr>
-    </table>
-    <h3><a name="dataset.Collection"></a>2.3.1 objectType: Collection
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dataset.Collection</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">A generic organizational construct which allows Datasets to be associated with each other by a set of Collection properties.
-            Datasets tagged with the same Collection properies can be assumed to have some degree of compatibility.
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dataset">dataset</a></td>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#ivoa.Quantity">Quantity [provenance:ivoa.Quantity]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -581,13 +323,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.Collection.name"></a><b>name</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="ivoa.IntegerQuantity.value"></a><b>value</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.Collection.name</td>
+                      <td class="feature-detail">ivoa.IntegerQuantity.value</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -595,8 +337,8 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">The values are generally defined by the creating entity.  Examples: "WFC", "Sloan", "BFS Spectrograph", "MSX Galactic Plane
-                        Survey".
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
@@ -607,20 +349,18 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dataset.Contact"></a>2.3.2 objectType: Contact
+    </div><br><h3><a name="ivoa.Quantity"></a>2.2.2 dataType: Quantity
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dataset.Contact</td>
+          <td class="objecttype-name" colspan="1">ivoa.Quantity</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Contact information for a person or entity.
-            
-            Contact is modeled as a Role played by a particular person or entity (Party).  We subset the type of Party to include only
-            Individuals.  This includes both a physical person, or proxy service such as a helpdesk.
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
             
           </td>
         </tr>
@@ -632,14 +372,15 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dataset">dataset</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#party.Role">Role [provenance:party.Role]</a></td>
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#ivoa.IntegerQuantity">IntegerQuantity</a> <a href="#ivoa.RealQuantity">RealQuantity</a> 
+                      </td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">references</td>
+                      <td colspan="3" class="info-title">attributes</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -647,21 +388,24 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.Contact.party"></a><b>party</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="ivoa.Quantity.unit"></a><b>unit</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#party.Individual">Individual [provenance:party.Individual]</a></td>
+                      <td class="feature-detail"><a href="#ivoa.Unit">Unit [provenance:ivoa.Unit]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.Contact.party</td>
+                      <td class="feature-detail">ivoa.Quantity.unit</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Reference to the Individual associated with this role.</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                   </table>
                 </td>
@@ -670,17 +414,20 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dataset.Contributor"></a>2.3.3 objectType: Contributor
+    </div><br><h3><a name="ivoa.RealQuantity"></a>2.2.3 dataType: RealQuantity
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dataset.Contributor</td>
+          <td class="objecttype-name" colspan="1">ivoa.RealQuantity</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Contributor is modeled as a Role played by a Party or entity who participated in the generation of the Dataset.</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
         </tr>
         <tr>
           <td colspan="2">
@@ -690,11 +437,11 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dataset">dataset</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#party.Role">Role [provenance:party.Role]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#ivoa.Quantity">Quantity [provenance:ivoa.Quantity]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -705,13 +452,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.Contributor.acknowledgment"></a><b>acknowledgment</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="ivoa.RealQuantity.value"></a><b>value</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#ivoa.real">real [provenance:ivoa.real]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.Contributor.acknowledgment</td>
+                      <td class="feature-detail">ivoa.RealQuantity.value</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -719,8 +466,9 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Acknowledgment expression for the contributor.  Users of the dataset should include these in subsequent credits and acknowledgements.
-                        The expression should be formatted as desired by the contributor.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
                       </td>
                     </tr>
                   </table>
@@ -730,109 +478,224 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dataset.CreationType"></a>2.3.4 enumeration: CreationType
+    </div><br><h3><a name="ivoa.Unit"></a>2.2.4 primitiveType: Unit
     </h3>
     <table border="1" width="100%" cellspacing="2">
       <tr>
         <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="2">dataset.CreationType</td>
+        <td class="objecttype-name" colspan="1">ivoa.Unit</td>
       </tr>
       <tr>
         <td class="info-title">description</td>
-        <td class="feature-detail" colspan="2">Enumeration of dataset creation types.</td>
+        <td class="feature-detail" colspan="1">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
       </tr>
       <tr>
         <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#dataset">dataset</a></td>
-      </tr>
-      <tr>
-        <td colspan="3" class="info-title" align="center">literals</td>
+        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
       </tr>
+    </table><br><h3><a name="ivoa.anyURI"></a>2.2.5 primitiveType: anyURI
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
       <tr>
-        <td class="feature-heading" width="25%">name</td>
-        <td class="feature-heading" width="25%">feature</td>
-        <td class="feature-heading" width="50%">value</td>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">ivoa.anyURI</td>
       </tr>
       <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.CreationType.ARCHIVAL"></a>ARCHIVAL
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">
+          TODO : Missing description : please, update your UML model asap.
+          
         </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.CreationType.ARCHIVAL</td>
       </tr>
       <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">Indicates that it is one of a collection of datasets generated in a systematic, homogeneous way and is stored statically (or
-          at least versioned).  It will be possible to regenerate this dataset at a later date.  The remaining types imply on-the-fly
-          manipulation.
-        </td>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
       </tr>
+    </table><br><h3><a name="boolean"></a>2.2.6 primitiveType: boolean
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
       <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.CreationType.CUTOUT"></a>CUTOUT
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.CreationType.CUTOUT</td>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">boolean</td>
       </tr>
       <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">Indicates that the dataset was created "on-the-fly", by subsetting, but not by modifying values.
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">
+          TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.CreationType.FILTERED"></a>FILTERED
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.CreationType.FILTERED</td>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
       </tr>
+    </table><br><h3><a name="complex"></a>2.2.7 primitiveType: complex
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
       <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">May involve excluding data prior to binning into samples, also "on-the-fly"
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">complex</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">
+          TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.CreationType.MOSAIC"></a>MOSAIC
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
+      </tr>
+    </table><br><h3><a name="ivoa.datetime"></a>2.2.8 primitiveType: datetime
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">ivoa.datetime</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">
+          TODO : Missing description : please, update your UML model asap.
+          
         </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.CreationType.MOSAIC</td>
       </tr>
       <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">Combines multiple original datasets "on-the-fly"</td>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
+      </tr>
+    </table><br><h3><a name="integer"></a>2.2.9 primitiveType: integer
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">integer</td>
       </tr>
       <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.CreationType.SPECTRAL_EXTRACTION"></a>SPECTRAL_EXTRACTION
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">
+          TODO : Missing description : please, update your UML model asap.
+          
         </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.CreationType.SPECTRAL_EXTRACTION</td>
       </tr>
       <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">Has been extracted, for example, from a spectral data cube.
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
+      </tr>
+    </table><br><h3><a name="ivoa.nonnegativeinteger"></a>2.2.10 primitiveType: nonnegativeinteger
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">ivoa.nonnegativeinteger</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
+      </tr>
+    </table><br><h3><a name="rational"></a>2.2.11 primitiveType: rational
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">rational</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">
+          TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.CreationType.CATALOG_EXTRACTION"></a>CATALOG_EXTRACTION
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
+      </tr>
+    </table><br><h3><a name="ivoa.real"></a>2.2.12 primitiveType: real
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">ivoa.real</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">
+          TODO : Missing description : please, update your UML model asap.
+          
         </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.CreationType.CATALOG_EXTRACTION</td>
       </tr>
       <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">Has been extracted from a catalog.</td>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
+      </tr>
+    </table><br><h3><a name="string"></a>2.2.13 primitiveType: string
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">string</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
+      </tr>
+    </table><br><h3><a name="provenance"></a>2.3 package: provenance
+    </h3>
+    <table border="1" cellspacing="2" width="100%">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">provenance</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">This document provides a data model for describing provenance.</td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">parent</td>
+        <td colspan="2" class="feature-detail"><a href="#model_section">provenance</a></td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Object types</td>
+        <td colspan="2" class="feature-detail"><a href="#provenance.Activity">Activity</a> <a href="#provenance.ActivityDescription">ActivityDescription</a> <a href="#provenance.ActivityFlow">ActivityFlow</a> <a href="#provenance.Agent">Agent</a> <a href="#provenance.Collection">Collection</a> <a href="#provenance.Entity">Entity</a> <a href="#provenance.EntityDescription">EntityDescription</a> <a href="#provenance.HadMember">HadMember</a> <a href="#provenance.HadStep">HadStep</a> <a href="#provenance.Parameter">Parameter</a> <a href="#provenance.ParameterDescription">ParameterDescription</a> <a href="#provenance.Used">Used</a> <a href="#provenance.UsedDescription">UsedDescription</a> <a href="#provenance.WasAssociatedWith">WasAssociatedWith</a> <a href="#provenance.WasAttributedTo">WasAttributedTo</a> <a href="#provenance.WasGeneratedBy">WasGeneratedBy</a> <a href="#provenance.WasGeneratedByDescription">WasGeneratedByDescription</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Enumerations</td>
+        <td colspan="2" class="feature-detail"><a href="#provenance.AgentRole">AgentRole</a> 
+        </td>
       </tr>
-    </table><br><h3><a name="dataset.Creator"></a>2.3.5 objectType: Creator
+    </table>
+    <h3><a name="provenance.Activity"></a>2.3.1 objectType: Activity
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dataset.Creator</td>
+          <td class="objecttype-name" colspan="1">provenance.Activity</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Creator is modeled as a Role played by the organization or entity which created the Dataset.
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
             
           </td>
         </tr>
@@ -844,46 +707,17 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dataset">dataset</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#party.Role">Role [provenance:party.Role]</a></td>
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#provenance.ActivityFlow">ActivityFlow</a> 
+                      </td>
                     </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="dataset.Curation"></a>2.3.6 objectType: Curation
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dataset.Curation</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">The Curation object provides metadata assigned by the entity responsible for the support of the dataset content as well as
-            identifying metadata about that entity.  It is assembled from definitions provided by the IVOA standard document, "Resource
-            Metadata for the Virtual Observatory; Version 1.12"  (Resource Metadata).  Here, we provide a brief description of each field
-            for easy reference, along with a notation of its mapping to the Resource Metadata document (RM:field), where the reader may
-            find more detailed information.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dataset">dataset</a></td>
+                      <td class="info-title">referrers</td>
+                      <td class="feature-detail" colspan="3"><a href="#provenance.Activity">Activity</a> <a href="#provenance.HadStep">HadStep</a> 
+                      </td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -894,36 +728,30 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.Curation.publisherDID"></a><b>publisherDID</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Activity.id"></a><b>id</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa.anyURI">anyURI [provenance:ivoa.anyURI]</a></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.Curation.publisherDID</td>
+                      <td class="feature-detail">provenance.Activity.id</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">IVOA dataset identifier assigned by the publisher to uniquely identify the dataset within its holdings.  Typically, the basis
-                        of this identifier will be the publisher ID.  However, if the publisherchooses to use a 'global index service' such as ADS
-                        to obtain persistent identifiers for their datasets, rather than generate their own, that identifier should be used both here
-                        and for DataID.datasetID.  Note: this model also defines a creator dataset ID (DataID.creatorDID), these will differ if the
-                        publishing entity is not the creator of the dataset.  Values are to be expressed as dataset identifiers using the syntax described
-                        in "IVOA Identifiers"
-                      </td>
+                      <td class="feature-detail"><Enter note text here></td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.Curation.version"></a><b>version</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Activity.name"></a><b>name</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.Curation.version</td>
+                      <td class="feature-detail">provenance.Activity.name</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -931,38 +759,56 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Version of the curated dataset, assigned by the publisher.  This is an independent versioning from DataID.version that allows
-                        the publisher to track changes to the high level dataset metadata (e.g. curation metadata, identifiers, etc.) without effecting
-                        the creator defined dataset version.  The value may be based on the DataID.version (e.g. by adding a sub-version extension),
-                        or an independent versioning.  There are no format restrictions on the value.  (RM:Curation.Version)
+                      <td class="feature-detail"><Enter note text here></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Activity.startTime"></a><b>startTime</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">provenance.Activity.startTime</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.Curation.releaseDate"></a><b>releaseDate</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Activity.endTime"></a><b>endTime</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa.datetime">datetime [provenance:ivoa.datetime]</a></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.Curation.releaseDate</td>
+                      <td class="feature-detail">provenance.Activity.endTime</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Date the curated dataset was last modified.  (RM:Curation.Date)</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.Curation.rights"></a><b>rights</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Activity.annotation"></a><b>annotation</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dataset.RightsType">RightsType [provenance:dataset.RightsType]</a></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.Curation.rights</td>
+                      <td class="feature-detail">provenance.Activity.annotation</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -976,7 +822,7 @@
                       </td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">collections</td>
+                      <td colspan="3" class="info-title">references</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -984,40 +830,65 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="dataset.Curation.contact"></a><b>contact</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Activity.activity"></a><b>activity</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dataset.Contact">Contact [provenance:dataset.Contact]</a></td>
+                      <td class="feature-detail"><a href="#provenance.Activity">Activity [provenance:provenance.Activity]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.Curation.contact</td>
+                      <td class="feature-detail">provenance.Activity.activity</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-detail">0..*</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Activity.activityDescription"></a><b>activityDescription</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#provenance.ActivityDescription">ActivityDescription [provenance:provenance.ActivityDescription]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">provenance.Activity.activityDescription</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Contact information of the person/entity responsible for the content of the dataset.  We recommend using a generic 'helpdesk'
-                        type contact rather than individuals whose information may more easily become obsolete. (RM:Curation.Contact)
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="dataset.Curation.publisher"></a><b>publisher</b></td>
+                      <td colspan="3" class="info-title">collections</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Activity.parameter"></a><b>parameter</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dataset.Publisher">Publisher [provenance:dataset.Publisher]</a></td>
+                      <td class="feature-detail"><a href="#provenance.Parameter">Parameter [provenance:provenance.Parameter]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.Curation.publisher</td>
+                      <td class="feature-detail">provenance.Activity.parameter</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td class="feature-detail">0..*</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">isOrdered</td>
@@ -1025,16 +896,19 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">The entity making the data available.  (RM:Curation.Publisher)</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="dataset.Curation.reference"></a><b>reference</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Activity.used"></a><b>used</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dataset.Publication">Publication [provenance:dataset.Publication]</a></td>
+                      <td class="feature-detail"><a href="#provenance.Used">Used [provenance:provenance.Used]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.Curation.reference</td>
+                      <td class="feature-detail">provenance.Activity.used</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1046,9 +920,58 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Zero or more bibliographic or documentation references associated with the dataset.  Each instance provides a single forward
-                        link to a major publication which references the dataset.  (RM:General.Source)
-                      </td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Activity.wasAssociatedWith"></a><b>wasAssociatedWith</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#provenance.WasAssociatedWith">WasAssociatedWith [provenance:provenance.WasAssociatedWith]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">provenance.Activity.wasAssociatedWith</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">0..*</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">isOrdered</td>
+                      <td class="feature-detail">false</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Activity.wasGeneratedBy"></a><b>wasGeneratedBy</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#provenance.WasGeneratedBy">WasGeneratedBy [provenance:provenance.WasGeneratedBy]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">provenance.Activity.wasGeneratedBy</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">0..*</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">isOrdered</td>
+                      <td class="feature-detail">false</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                   </table>
                 </td>
@@ -1057,23 +980,18 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dataset.DataID"></a>2.3.7 objectType: DataID
+    </div><br><h3><a name="provenance.ActivityDescription"></a>2.3.2 objectType: ActivityDescription
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dataset.DataID</td>
+          <td class="objecttype-name" colspan="1">provenance.ActivityDescription</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">The Data Identification object (DataID) stores the dataset identifiers and other metadata typically assigned by the dataset
-            creator.
-            	The Dataset IDs in this object must comply with the syntax for dataset identifiers defined in the "IVOA Identifiers" document,
-            including the use of 'stop' characters to identify specific datasets that are not individually in the registry.   e.g., ivo://example.net/aservice?2013/5/2342.
-            	Much of the content of this object is assembled from various definitions in the IVAO Resource Metadata document.  Here, we
-            provide a brief description of each field for easy reference, along with a notation of its mapping to the Resource Metadata
-            document (RM:field), where the reader may find more detailed information.
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
             
           </td>
         </tr>
@@ -1085,7 +1003,12 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dataset">dataset</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
+                    </tr>
+                    <tr>
+                      <td class="info-title">referrers</td>
+                      <td class="feature-detail" colspan="3"><a href="#provenance.Activity">Activity</a> 
+                      </td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -1096,13 +1019,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.DataID.title"></a><b>title</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ActivityDescription.id"></a><b>id</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.DataID.title</td>
+                      <td class="feature-detail">provenance.ActivityDescription.id</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1110,16 +1033,19 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">A free form string giving a title for the dataset.  (RM:Identity.Title)</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.DataID.datasetID"></a><b>datasetID</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ActivityDescription.name"></a><b>name</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa.anyURI">anyURI [provenance:ivoa.anyURI]</a></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.DataID.datasetID</td>
+                      <td class="feature-detail">provenance.ActivityDescription.name</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1127,21 +1053,16 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">If the dataset is registered with an external 'global index service' such as ADS, the publisher may include that identifier
-                        here.  This provides a common, persistent identifier for the dataset, and possible access point to follow for information
-                        on publications and other related datasets.  Note: the same dataset published at more than one location would have different
-                        Curation.publisherDID values, but the same DataID.datasetID.  eg: "ivo://ADS/Sa.CXO?obsid=1234", "ivo://ADS/sh.hut#ngc4151_141"
-                        
-                      </td>
+                      <td class="feature-detail"><Enter note text here></td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.DataID.creatorDID"></a><b>creatorDID</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ActivityDescription.type"></a><b>type</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa.anyURI">anyURI [provenance:ivoa.anyURI]</a></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.DataID.creatorDID</td>
+                      <td class="feature-detail">provenance.ActivityDescription.type</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1149,21 +1070,19 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">The dataset identifier assigned by the creator.  Here, the authority-id of the identifier must be that of the creator.  It
-                        is used to identify the original exposure of the dataset in an archive, and will remain static regardless of where the dataset
-                        is published.  The creator ID will not necessarily change even if the VO object in question is a cutout or is otherwise further
-                        processed.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.DataID.version"></a><b>version</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ActivityDescription.subtype"></a><b>subtype</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.DataID.version</td>
+                      <td class="feature-detail">provenance.ActivityDescription.subtype</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1171,19 +1090,19 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Version assigned by the creator, reflecting the production version of the dataset.  This value should only be changed by the
-                        creator, upon the new release of a dataset.  There are no format restrictions or specifications on the versioning scheme.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.DataID.date"></a><b>date</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ActivityDescription.description"></a><b>description</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa.datetime">datetime [provenance:ivoa.datetime]</a></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.DataID.date</td>
+                      <td class="feature-detail">provenance.ActivityDescription.description</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1191,16 +1110,19 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Data processing or creation date (RM:Curation.Date).</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.DataID.creationType"></a><b>creationType</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ActivityDescription.doculink"></a><b>doculink</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dataset.CreationType">CreationType [provenance:dataset.CreationType]</a></td>
+                      <td class="feature-detail"><a href="#ivoa.anyURI">anyURI [provenance:ivoa.anyURI]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.DataID.creationType</td>
+                      <td class="feature-detail">provenance.ActivityDescription.doculink</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1208,9 +1130,9 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">The dataset creation type describes the nature or genre of the content.  (RM:General.Type).
-                        Note: This field provides information about the process by which the dataset was created.  As the Observation/Experiment model
-                        matures, this may evolve into a provenance element on the Experiment type.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
                       </td>
                     </tr>
                     <tr>
@@ -1222,13 +1144,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="dataset.DataID.collection"></a><b>collection</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.ActivityDescription.parameterDescription"></a><b>parameterDescription</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dataset.Collection">Collection [provenance:dataset.Collection]</a></td>
+                      <td class="feature-detail"><a href="#provenance.ParameterDescription">ParameterDescription [provenance:provenance.ParameterDescription]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.DataID.collection</td>
+                      <td class="feature-detail">provenance.ActivityDescription.parameterDescription</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1240,18 +1162,19 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">The dataset is associated with zero or more Collections (instrument name, survey name, etc.) .  Each instance identifies a
-                        tag indicating some degree of compatibility with other data sharing the same Collection properties.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="dataset.DataID.contributor"></a><b>contributor</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.ActivityDescription.usedDescription"></a><b>usedDescription</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dataset.Contributor">Contributor [provenance:dataset.Contributor]</a></td>
+                      <td class="feature-detail"><a href="#provenance.UsedDescription">UsedDescription [provenance:provenance.UsedDescription]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.DataID.contributor</td>
+                      <td class="feature-detail">provenance.ActivityDescription.usedDescription</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1263,22 +1186,91 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Persons or entities who contributed to the generation of the scientific content of the dataset.  Users of the dataset should
-                        include these in subsequent credits and acknowledgements. (RM:Curation.Contributor)
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="dataset.DataID.creator"></a><b>creator</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.ActivityDescription.wasGeneratedByDescription"></a><b>wasGeneratedByDescription</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dataset.Creator">Creator [provenance:dataset.Creator]</a></td>
+                      <td class="feature-detail"><a href="#provenance.WasGeneratedByDescription">WasGeneratedByDescription [provenance:provenance.WasGeneratedByDescription]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.DataID.creator</td>
+                      <td class="feature-detail">provenance.ActivityDescription.wasGeneratedByDescription</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-detail">0..*</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">isOrdered</td>
+                      <td class="feature-detail">false</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="provenance.ActivityFlow"></a>2.3.3 objectType: ActivityFlow
+    </h3>
+    <div align="center">
+      <table border="1" width="100%" cellspacing="2">
+        <tr>
+          <td class="objecttype-title" width="20%">vodml-id</td>
+          <td class="objecttype-name" colspan="1">provenance.ActivityFlow</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">
+            <table width="100%" cellpadding="0" cellspacing="0" border="0">
+              <tr>
+                <td colspan="2" bgcolor="#cacaca">
+                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
+                    <tr>
+                      <td width="20%" class="info-title">package</td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
+                    </tr>
+                    <tr>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance.Activity">Activity [provenance:provenance.Activity]</a></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">collections</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.ActivityFlow.hadStep"></a><b>hadStep</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#provenance.HadStep">HadStep [provenance:provenance.HadStep]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">provenance.ActivityFlow.hadStep</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">0..*</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">isOrdered</td>
@@ -1286,7 +1278,10 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">The institution or entity which created the dataset.</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                   </table>
                 </td>
@@ -1295,20 +1290,18 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dataset.DataModel"></a>2.3.8 objectType: DataModel
+    </div><br><h3><a name="provenance.Agent"></a>2.3.4 objectType: Agent
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dataset.DataModel</td>
+          <td class="objecttype-name" colspan="1">provenance.Agent</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">This object provides specific information regarding the data model and version thereof that a dataset represents.  This information
-            is primarily an aide to (de)serialization of the dataset.  As such, it would better be defined by serialization conventions.
-            In lieu of such conventions, we include this object and representative serialization examples for the primary file formats
-            VOTable and FITS.
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
             
           </td>
         </tr>
@@ -1320,7 +1313,7 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dataset">dataset</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -1331,13 +1324,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.DataModel.name"></a><b>name</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Agent.id"></a><b>id</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.DataModel.name</td>
+                      <td class="feature-detail">provenance.Agent.id</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1345,47 +1338,84 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Formatted string providing the name and version of the model document.  The format speficication is "[name]-[version].[subversion]".
-                        Each derived model should specifically state the appropriate string for this field.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.DataModel.prefix"></a><b>prefix</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Agent.name"></a><b>name</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.DataModel.prefix</td>
+                      <td class="feature-detail">provenance.Agent.name</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Prefix string used in UType string for elements associated with the model.  For IVOA standard models, this will be a predetermined
-                        string (e.g. 'stc' or 'spec').  Extended, or user defined content can specify a unique prefix for their own content.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.DataModel.URL"></a><b>URL</b></td>
+                      <td colspan="3" class="info-title">collections</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Agent.wasAssociatedWith"></a><b>wasAssociatedWith</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa.anyURI">anyURI [provenance:ivoa.anyURI]</a></td>
+                      <td class="feature-detail"><a href="#provenance.WasAssociatedWith">WasAssociatedWith [provenance:provenance.WasAssociatedWith]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.DataModel.URL</td>
+                      <td class="feature-detail">provenance.Agent.wasAssociatedWith</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-detail">0..*</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">isOrdered</td>
+                      <td class="feature-detail">false</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Agent.wasAttributedTo"></a><b>wasAttributedTo</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#provenance.WasAttributedTo">WasAttributedTo [provenance:provenance.WasAttributedTo]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">provenance.Agent.wasAttributedTo</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">0..*</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">isOrdered</td>
+                      <td class="feature-detail">false</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">URL pointer to the XML schema associated with the model.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
@@ -1396,20 +1426,23 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dataset.DataProductType"></a>2.3.9 enumeration: DataProductType
+    </div><br><h3><a name="provenance.AgentRole"></a>2.3.5 enumeration: AgentRole
     </h3>
     <table border="1" width="100%" cellspacing="2">
       <tr>
         <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="2">dataset.DataProductType</td>
+        <td class="objecttype-name" colspan="2">provenance.AgentRole</td>
       </tr>
       <tr>
         <td class="info-title">description</td>
-        <td class="feature-detail" colspan="2">Enumeration identifying the high level classification of a data product.</td>
+        <td class="feature-detail" colspan="2">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
       </tr>
       <tr>
         <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#dataset">dataset</a></td>
+        <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
       </tr>
       <tr>
         <td colspan="3" class="info-title" align="center">literals</td>
@@ -1420,120 +1453,189 @@
         <td class="feature-heading" width="50%">value</td>
       </tr>
       <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.DataProductType.CUBE"></a>CUBE
+        <td class="feature-detail" rowspan="2" valign="top"><a name="provenance.AgentRole.Observer"></a>Observer
         </td>
         <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.DataProductType.CUBE</td>
+        <td class="feature-detail">provenance.AgentRole.Observer</td>
       </tr>
       <tr>
         <td class="feature-heading">description</td>
-        <td class="feature-detail">A multidimensional astronomical image of three (3) or more axes.
-          
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
         </td>
       </tr>
       <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.DataProductType.IMAGE"></a>IMAGE
+        <td class="feature-detail" rowspan="2" valign="top"><a name="provenance.AgentRole.Creator"></a>Creator
         </td>
         <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.DataProductType.IMAGE</td>
+        <td class="feature-detail">provenance.AgentRole.Creator</td>
       </tr>
       <tr>
         <td class="feature-heading">description</td>
-        <td class="feature-detail">A two (2) dimensional astronomical image.</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
       </tr>
       <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.DataProductType.PHOTOMETRY"></a>PHOTOMETRY
+        <td class="feature-detail" rowspan="2" valign="top"><a name="provenance.AgentRole.Author"></a>Author
         </td>
         <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.DataProductType.PHOTOMETRY</td>
+        <td class="feature-detail">provenance.AgentRole.Author</td>
       </tr>
       <tr>
         <td class="feature-heading">description</td>
-        <td class="feature-detail">Dataset with spectral coverage with irregular gaps.
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.DataProductType.SPECTRUM"></a>SPECTRUM
+        <td class="feature-detail" rowspan="2" valign="top"><a name="provenance.AgentRole.Editor"></a>Editor
         </td>
         <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.DataProductType.SPECTRUM</td>
+        <td class="feature-detail">provenance.AgentRole.Editor</td>
       </tr>
       <tr>
         <td class="feature-heading">description</td>
-        <td class="feature-detail">Dataset where spectral coverage is the primary attribute, in contiguous bins. e.g. a 1D spectrum or a long slit spectrum.
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.DataProductType.TIMESERIES"></a>TIMESERIES
+        <td class="feature-detail" rowspan="2" valign="top"><a name="provenance.AgentRole.Publisher"></a>Publisher
         </td>
         <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.DataProductType.TIMESERIES</td>
+        <td class="feature-detail">provenance.AgentRole.Publisher</td>
       </tr>
       <tr>
         <td class="feature-heading">description</td>
-        <td class="feature-detail">Dataset presenting some quantity varying as a function of time.  A light curve is a typical example of a timeseries dataset.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.DataProductType.SED"></a>SED
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
         </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.DataProductType.SED</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">A spectral energy distribution, an advanced data product often produced by combining data from multiple observations.</td>
       </tr>
       <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.DataProductType.VISIBILITY"></a>VISIBILITY
+        <td class="feature-detail" rowspan="2" valign="top"><a name="provenance.AgentRole.Operator"></a>Operator
         </td>
         <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.DataProductType.VISIBILITY</td>
+        <td class="feature-detail">provenance.AgentRole.Operator</td>
       </tr>
       <tr>
         <td class="feature-heading">description</td>
-        <td class="feature-detail">A visibility (radio) dataset. Typically this is instrumental data, and is often a complex object containing multiple files
-          or other substructures.  A visibility dataset may contain data with spatial, spectral, time, and polarization information
-          for each measured visibility.
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
         </td>
       </tr>
       <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.DataProductType.EVENT"></a>EVENT
+        <td class="feature-detail" rowspan="2" valign="top"><a name="provenance.AgentRole.Coordinator"></a>Coordinator
         </td>
         <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.DataProductType.EVENT</td>
+        <td class="feature-detail">provenance.AgentRole.Coordinator</td>
       </tr>
       <tr>
         <td class="feature-heading">description</td>
-        <td class="feature-detail">An event counting dataset (e.g. X-ray). An event dataset may contain data with spatial, spectral, and time information for
-          each measured event. 
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
         </td>
       </tr>
       <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.DataProductType.CATALOG"></a>CATALOG
+        <td class="feature-detail" rowspan="2" valign="top"><a name="provenance.AgentRole.Provider"></a>Provider
         </td>
         <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.DataProductType.CATALOG</td>
+        <td class="feature-detail">provenance.AgentRole.Provider</td>
       </tr>
       <tr>
         <td class="feature-heading">description</td>
-        <td class="feature-detail">A catalog.
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
-    </table><br><h3><a name="dataset.Dataset"></a>2.3.10 objectType: Dataset
+    </table><br><h3><a name="provenance.Collection"></a>2.3.6 objectType: Collection
+    </h3>
+    <div align="center">
+      <table border="1" width="100%" cellspacing="2">
+        <tr>
+          <td class="objecttype-title" width="20%">vodml-id</td>
+          <td class="objecttype-name" colspan="1">provenance.Collection</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">
+            <table width="100%" cellpadding="0" cellspacing="0" border="0">
+              <tr>
+                <td colspan="2" bgcolor="#cacaca">
+                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
+                    <tr>
+                      <td width="20%" class="info-title">package</td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
+                    </tr>
+                    <tr>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance.Entity">Entity [provenance:provenance.Entity]</a></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">collections</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Collection.hadMember"></a><b>hadMember</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#provenance.HadMember">HadMember [provenance:provenance.HadMember]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">provenance.Collection.hadMember</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">0..*</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">isOrdered</td>
+                      <td class="feature-detail">false</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="provenance.Entity"></a>2.3.7 objectType: Entity
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dataset.Dataset</td>
+          <td class="objecttype-name" colspan="1">provenance.Entity</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Abstract object for the generic IVOA Dataset.  It is intended to be useful for any type of data.  Specific dataset models
-            should extend this object, providing detailed definitions and additional content as appropriate for that type of dataset.
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
             
           </td>
         </tr>
@@ -1545,11 +1647,16 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dataset">dataset</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#experiment.ObsDataset">ObsDataset</a> 
+                      <td class="feature-detail" colspan="3"><a href="#provenance.Collection">Collection</a> 
+                      </td>
+                    </tr>
+                    <tr>
+                      <td class="info-title">referrers</td>
+                      <td class="feature-detail" colspan="3"><a href="#provenance.Entity">Entity</a> <a href="#provenance.HadMember">HadMember</a> 
                       </td>
                     </tr>
                     <tr>
@@ -1561,13 +1668,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.Dataset.dataProductType"></a><b>dataProductType</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Entity.id"></a><b>id</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dataset.DataProductType">DataProductType [provenance:dataset.DataProductType]</a></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.Dataset.dataProductType</td>
+                      <td class="feature-detail">provenance.Entity.id</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1575,20 +1682,19 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Describes the high level scientific classification of the data content.  Values are restricted to the DataProductType enumeration
-                        set and convey the general idea of the content and organization of
-                        a dataset.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.Dataset.dataProductSubtype"></a><b>dataProductSubtype</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Entity.name"></a><b>name</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.Dataset.dataProductSubtype</td>
+                      <td class="feature-detail">provenance.Entity.name</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1596,95 +1702,70 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Secondary type classification for the dataset.  This field is intended to precisely specify the scientific nature of the data
-                        product, possibly in terms relevant only to a specific archive or data collection.  For example, dataProductType='image' could
-                        have associated dataProductSubtype="src.image", "bkg.image", "PixelMask", etc.  Values are unrestricted strings.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">collections</td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Entity.type"></a><b>type</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">provenance.Entity.type</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">0..1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="dataset.Dataset.curation"></a><b>curation</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Entity.annotation"></a><b>annotation</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dataset.Curation">Curation [provenance:dataset.Curation]</a></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.Dataset.curation</td>
+                      <td class="feature-detail">provenance.Entity.annotation</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Provides metadata related to the entity responsible for the curation of the dataset.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="dataset.Dataset.dataID"></a><b>dataID</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Entity.rights"></a><b>rights</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dataset.DataID">DataID [provenance:dataset.DataID]</a></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.Dataset.dataID</td>
+                      <td class="feature-detail">provenance.Entity.rights</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
                       <td class="feature-detail">1</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">DataID provides high level identification metadata for the dataset itself, and any associations with various collections.</td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="dataset.Publication"></a>2.3.11 objectType: Publication
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dataset.Publication</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Any referenceable publication associated with a Dataset.</td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dataset">dataset</a></td>
+                      <td class="feature-detail"><Enter note text here></td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">attributes</td>
+                      <td colspan="3" class="info-title">references</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -1692,59 +1773,47 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.Publication.refCode"></a><b>refCode</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Entity.entityDescription"></a><b>entityDescription</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#provenance.EntityDescription">EntityDescription [provenance:provenance.EntityDescription]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.Publication.refCode</td>
+                      <td class="feature-detail">provenance.Entity.entityDescription</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Reference code of the publication.  Values should be expressed as a URL, or bibcode (discernible as a 19 character string
-                        beginning with 4 digits).  Free text references are allowed, but discouraged.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
                       </td>
                     </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="dataset.Publisher"></a>2.3.12 objectType: Publisher
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dataset.Publisher</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Publisher is modeled as a Role played by the organization or entity making the Dataset available.</td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dataset">dataset</a></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Entity.progenitor"></a><b>progenitor</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#provenance.Entity">Entity [provenance:provenance.Entity]</a></td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#party.Role">Role [provenance:party.Role]</a></td>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">provenance.Entity.progenitor</td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">attributes</td>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">0..*</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">collections</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -1752,334 +1821,74 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dataset.Publisher.publisherID"></a><b>publisherID</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Entity.used"></a><b>used</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa.anyURI">anyURI [provenance:ivoa.anyURI]</a></td>
+                      <td class="feature-detail"><a href="#provenance.Used">Used [provenance:provenance.Used]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dataset.Publisher.publisherID</td>
+                      <td class="feature-detail">provenance.Entity.used</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-detail">0..*</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">isOrdered</td>
+                      <td class="feature-detail">false</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">IVOA resource identifier associated with the publisher and registered with an IVOA compliant registry  (eg: ivo://mast.stsci.edu).
-                        Values are to be expressed using the syntax described in "IVOA Identifiers".
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="dataset.RightsType"></a>2.3.13 enumeration: RightsType
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="2">dataset.RightsType</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="2">Enumeration of access rights levels.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#dataset">dataset</a></td>
-      </tr>
-      <tr>
-        <td colspan="3" class="info-title" align="center">literals</td>
-      </tr>
-      <tr>
-        <td class="feature-heading" width="25%">name</td>
-        <td class="feature-heading" width="25%">feature</td>
-        <td class="feature-heading" width="50%">value</td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.RightsType.PUBLIC"></a>PUBLIC
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.RightsType.PUBLIC</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">unrestricted, public access is allowed, without authentication.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.RightsType.PROPRIETARY"></a>PROPRIETARY
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.RightsType.PROPRIETARY</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">only proprietary access is allowed with authentication. 
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.RightsType.SECURE"></a>SECURE
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.RightsType.SECURE</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">authenticated, public access is allowed.</td>
-      </tr>
-    </table><br><h3><a name="dataset.SpectralBandType"></a>2.3.14 enumeration: SpectralBandType
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="2">dataset.SpectralBandType</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="2">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#dataset">dataset</a></td>
-      </tr>
-      <tr>
-        <td colspan="3" class="info-title" align="center">literals</td>
-      </tr>
-      <tr>
-        <td class="feature-heading" width="25%">name</td>
-        <td class="feature-heading" width="25%">feature</td>
-        <td class="feature-heading" width="50%">value</td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.SpectralBandType.RADIO"></a>RADIO
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.SpectralBandType.RADIO</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">λ ≥ 10 mm; ν ≤ 30 GHz</td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.SpectralBandType.MILLIMETER"></a>MILLIMETER
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.SpectralBandType.MILLIMETER</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">0.1 mm ≤ λ ≤ 10 mm; 3000 GHz ≥ ν ≥ 30 GHz
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.SpectralBandType.INFRARED"></a>INFRARED
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.SpectralBandType.INFRARED</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">1 μ ≤ λ ≤ 100 μ</td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.SpectralBandType.OPTICAL"></a>OPTICAL
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.SpectralBandType.OPTICAL</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">0.3 μ ≤ λ ≤ 1 μ
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.SpectralBandType.ULTRAVIOLET"></a>ULTRAVIOLET
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.SpectralBandType.ULTRAVIOLET</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">100 Å ≤ λ ≤ 3000 Å; 1.2 eV ≤ E ≤ 120 eV
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.SpectralBandType.XRAY"></a>XRAY
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.SpectralBandType.XRAY</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">0.1 Å ≤ λ ≤ 100 Å; 0.12 keV ≤ E ≤ 120 keV
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="dataset.SpectralBandType.GAMMARAY"></a>GAMMARAY
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">dataset.SpectralBandType.GAMMARAY</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">E ≥ 120keV</td>
-      </tr>
-    </table><br><h3><a name="experiment"></a>2.4 package: experiment
-    </h3>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">experiment</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">The Observation Experiment model refers to several elements related to an Observation and its configuration.  As of the time
-          of this writing, there is no IVOA recommendation for a general Observation data model.  The Provenance data model, in progress,
-          will define the pattern for describing the relation between actions and results, and how to record these in datasets.  In
-          lieu of these standards, this document defines a straw-man Observation model.  
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#model_section">provenance</a></td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#experiment.AstroTarget">AstroTarget</a> <a href="#experiment.BaseTarget">BaseTarget</a> <a href="#experiment.Characterisation">Characterisation</a> <a href="#experiment.Derived">Derived</a> <a href="#experiment.DerivedElement">DerivedElement</a> <a href="#experiment.DerivedScalar">DerivedScalar</a> <a href="#experiment.Facility">Facility</a> <a href="#experiment.Instrument">Instrument</a> <a href="#experiment.ObsConfig">ObsConfig</a> <a href="#experiment.ObsDataset">ObsDataset</a> <a href="#experiment.Observation">Observation</a> <a href="#experiment.Proposal">Proposal</a> <a href="#experiment.Target">Target</a> 
-        </td>
-      </tr>
-    </table>
-    <h3><a name="experiment.AstroTarget"></a>2.4.1 objectType: AstroTarget
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">experiment.AstroTarget</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Extension of BaseTarget specialized for astronomical objects.  The AstroTarget defines additional astronomical properties
-            of the target.
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment">experiment</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment.BaseTarget">BaseTarget [provenance:experiment.BaseTarget]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.AstroTarget.objectClass"></a><b>objectClass</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Entity.wasAttributedTo"></a><b>wasAttributedTo</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#provenance.WasAttributedTo">WasAttributedTo [provenance:provenance.WasAttributedTo]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.AstroTarget.objectClass</td>
+                      <td class="feature-detail">provenance.Entity.wasAttributedTo</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">General classification or type of the target.  This field supports the discovery of data pertaining to a common class.  e.g.
-                        "Star", "Galaxy", "AGN".  At the time of this writing, there is no IVOA recommended vocabulary for this field.  The SIMBAD
-                        and NED databases use defined vocabularies for astronomical object classifications which may serve as the basis for such.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.AstroTarget.spectralClass"></a><b>spectralClass</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.AstroTarget.spectralClass</td>
+                      <td class="feature-detail">0..*</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-heading">isOrdered</td>
+                      <td class="feature-detail">false</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Spectral class of the object.  As with objectClass, there is no IVOA recommended vocabulary for specifying the spectral class
-                        of an object.  There is an IVOA Note on the subject entitled "An encoding system to represent stellar spectral classes in
-                        archival databases and catalogs", describing an encoding system which has been adopted by the MAST archive.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.AstroTarget.redshift"></a><b>redshift</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Entity.wasGeneratedBy"></a><b>wasGeneratedBy</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa.real">real [provenance:ivoa.real]</a></td>
+                      <td class="feature-detail"><a href="#provenance.WasGeneratedBy">WasGeneratedBy [provenance:provenance.WasGeneratedBy]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.AstroTarget.redshift</td>
+                      <td class="feature-detail">provenance.Entity.wasGeneratedBy</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">This field gives the canonical redshift of the astronomical object.  It is normally used to store the cosmological redshift
-                        of extragalactic objects, although it may also be used to store the observed redshift of Galactic sources if that information
-                        is felt by the data provider to be useful.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.AstroTarget.varAmpl"></a><b>varAmpl</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa.real">real [provenance:ivoa.real]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.AstroTarget.varAmpl</td>
+                      <td class="feature-detail">0..*</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-heading">isOrdered</td>
+                      <td class="feature-detail">false</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Canonical variability amplitude attributed to the target.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
@@ -2090,20 +1899,18 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.BaseTarget"></a>2.4.2 objectType: BaseTarget
+    </div><br><h3><a name="provenance.EntityDescription"></a>2.3.8 objectType: EntityDescription
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">experiment.BaseTarget</td>
+          <td class="objecttype-name" colspan="1">provenance.EntityDescription</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Abstract base class for the Target object tree.  The target object provides identifying metadata related to the subject or
-            goal of the experiment.  For an Observational experiment, this would typically be an astronomical object.  The BaseTarget
-            class defines high-level identifying information, and must be extended for particular classes of Target which may define additional
-            characteristics.
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
             
           </td>
         </tr>
@@ -2115,16 +1922,11 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment">experiment</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#experiment.AstroTarget">AstroTarget</a> <a href="#experiment.Target">Target</a> 
-                      </td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#experiment.ObsDataset">ObsDataset</a> 
+                      <td class="feature-detail" colspan="3"><a href="#provenance.Entity">Entity</a> 
                       </td>
                     </tr>
                     <tr>
@@ -2136,13 +1938,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.BaseTarget.name"></a><b>name</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.EntityDescription.id"></a><b>id</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.BaseTarget.name</td>
+                      <td class="feature-detail">provenance.EntityDescription.id</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -2150,240 +1952,93 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">The target name.  The primary purpose of this field is to provide the user with a recognizable identity of the particular
-                        subject or goal.  However, since this may be a query-able field in data discovery protocols, care should be taken to use values
-                        which follow conventions for the domain appropriate for the data.  For an astronomical object, this may be a name suitable
-                        for use within a domain-specific resolution service.  Simulated data might also use this sort of name (if simulating a particular
-                        object), or a more generic term such as "G2V star". 
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.BaseTarget.description"></a><b>description</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.EntityDescription.name"></a><b>name</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.BaseTarget.description</td>
+                      <td class="feature-detail">provenance.EntityDescription.name</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Free form description of target.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.BaseTarget.position"></a><b>position</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.EntityDescription.annotation"></a><b>annotation</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#stc.Position">Position [provenance:stc.Position]</a></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.BaseTarget.position</td>
+                      <td class="feature-detail">provenance.EntityDescription.annotation</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">This field provides the spatial location of the target.  The value is an STC Position object which supports all required dimensionality
-                        and coordinate frame specification needs.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="experiment.Characterisation"></a>2.4.3 objectType: Characterisation
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">experiment.Characterisation</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">This Characterisation object is a direct extension of the Characterisation object from the IVOA Characterisation Data Model
-            Standard.  This provides a local object which may be contained in a 'composition' relation to other objects of this model
-            (specifically ObsDataset).  This object may be extended and/or modified by specific Dataset models as needed.
-            	Characterisation provides a broad scale description of the coordinate space occupied by the dataset in each of the axis domains.
-            This includes axes not directly represented in the dataset 'data', for example, the Time axis of a 2D special image.  As such,
-            there is a strong correlation between Characterisation and Data objects.  In some cases, the values may be directly derived
-            from the Data, in others, they provide supporting metadata about the broader domain.  For example, the Accuracy fields in
-            Characterisation represent typical accuracy for the dataset, while those within Data provide per-data-point errors.   
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment">experiment</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#char.Char">Char [provenance:char.Char]</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="experiment.Derived"></a>2.4.4 objectType: Derived
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">experiment.Derived</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">The Derived (short for Derived Data) object holds derived information obtained by evaluating or analyzing the contents of
-            the dataset.  The specific content of this object is strongly dependent on the specific type of dataset, so we provide a generic
-            model which may be specialized in other models to define elements appropriate for that type of dataset.
-            
-            The primary purpose of this object is to provide a common framework in which specific information may be placed to aid in
-            discovery and filtering of datasets in various access protocols.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment">experiment</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">collections</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="experiment.Derived.derivedElement"></a><b>derivedElement</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.EntityDescription.category"></a><b>category</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#experiment.DerivedElement">DerivedElement [provenance:experiment.DerivedElement]</a></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.Derived.derivedElement</td>
+                      <td class="feature-detail">provenance.EntityDescription.category</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Collection of zero or more DerivedElement objects, each of which provides a specific quantity obtained by analyzing the dataset
-                        content.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="experiment.DerivedElement"></a>2.4.5 objectType: DerivedElement
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">experiment.DerivedElement</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Abstract base for defining derived data elements.  Typically, models for specific data products would extend this object to
-            define various elements appropriate for that model.  For example, the Spectrum model could define signal-to-noise ratio (SNR),
-            or TimeSeries could define period, or variability.  We put no restriction on the DerivedElement content since the result could
-            be a simple value or a complex object.  However, it is recommended that extensions be simple and compact in keeping with the
-            primary intent of use in data discovery.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment">experiment</a></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.EntityDescription.doculink"></a><b>doculink</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#ivoa.anyURI">anyURI [provenance:ivoa.anyURI]</a></td>
                     </tr>
                     <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#experiment.DerivedScalar">DerivedScalar</a> 
-                      </td>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">provenance.EntityDescription.doculink</td>
                     </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="experiment.DerivedScalar"></a>2.4.6 objectType: DerivedScalar
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">experiment.DerivedScalar</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Simple extension of DerivedElement class which can serve many use cases.  Usages of this object in other models to define
-            specific elements should explicitly define the element name, and the process by which the value is determined.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment">experiment</a></td>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment.DerivedElement">DerivedElement [provenance:experiment.DerivedElement]</a></td>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">attributes</td>
+                      <td colspan="3" class="info-title">collections</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -2391,38 +2046,50 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.DerivedScalar.name"></a><b>name</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.EntityDescription.usedDescription"></a><b>usedDescription</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#provenance.UsedDescription">UsedDescription [provenance:provenance.UsedDescription]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.DerivedScalar.name</td>
+                      <td class="feature-detail">provenance.EntityDescription.usedDescription</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td class="feature-detail">0..*</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">isOrdered</td>
+                      <td class="feature-detail">false</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Name identifying the derived element.</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.DerivedScalar.value"></a><b>value</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.EntityDescription.wasGeneratedByDescription"></a><b>wasGeneratedByDescription</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa.Quantity">Quantity [provenance:ivoa.Quantity]</a></td>
+                      <td class="feature-detail"><a href="#provenance.WasGeneratedByDescription">WasGeneratedByDescription [provenance:provenance.WasGeneratedByDescription]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.DerivedScalar.value</td>
+                      <td class="feature-detail">provenance.EntityDescription.wasGeneratedByDescription</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td class="feature-detail">0..*</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">isOrdered</td>
+                      <td class="feature-detail">false</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Value of the derived element.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
@@ -2433,17 +2100,18 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.Facility"></a>2.4.7 objectType: Facility
+    </div><br><h3><a name="provenance.HadMember"></a>2.3.9 objectType: HadMember
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">experiment.Facility</td>
+          <td class="objecttype-name" colspan="1">provenance.HadMember</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Facility performing the observation.
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
             
           </td>
         </tr>
@@ -2455,11 +2123,7 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment">experiment</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#party.Role">Role [provenance:party.Role]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">references</td>
@@ -2470,13 +2134,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.Facility.party"></a><b>party</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.HadMember.entity"></a><b>entity</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#party.Organization">Organization [provenance:party.Organization]</a></td>
+                      <td class="feature-detail"><a href="#provenance.Entity">Entity [provenance:provenance.Entity]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.Facility.party</td>
+                      <td class="feature-detail">provenance.HadMember.entity</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -2484,7 +2148,10 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Reference to the Party or Entity which is associated with this role.</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                   </table>
                 </td>
@@ -2493,18 +2160,19 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.Instrument"></a>2.4.8 objectType: Instrument
+    </div><br><h3><a name="provenance.HadStep"></a>2.3.10 objectType: HadStep
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">experiment.Instrument</td>
+          <td class="objecttype-name" colspan="1">provenance.HadStep</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Identifies the instrument used to create the data.  This can be a specific instrument name, general type or something else,
-            such as a program in the case of theoretical data.   (RM:Collection.Instrument) 
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
           </td>
         </tr>
         <tr>
@@ -2515,10 +2183,10 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment">experiment</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">attributes</td>
+                      <td colspan="3" class="info-title">references</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -2526,13 +2194,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.Instrument.name"></a><b>name</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.HadStep.activity"></a><b>activity</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#provenance.Activity">Activity [provenance:provenance.Activity]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.Instrument.name</td>
+                      <td class="feature-detail">provenance.HadStep.activity</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -2540,7 +2208,8 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Name of the instrument.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
@@ -2551,18 +2220,18 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.ObsConfig"></a>2.4.9 objectType: ObsConfig
+    </div><br><h3><a name="provenance.Parameter"></a>2.3.11 objectType: Parameter
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">experiment.ObsConfig</td>
+          <td class="objecttype-name" colspan="1">provenance.Parameter</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">ObsConfig describes all Observation Configuration metadata.  We define a small set of configuration elements which are required
-            as Provenance in the observation dataset.
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
             
           </td>
         </tr>
@@ -2574,12 +2243,7 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment">experiment</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#experiment.ObsDataset">ObsDataset</a> 
-                      </td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2590,58 +2254,47 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.ObsConfig.bandpass"></a><b>bandpass</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Parameter.id"></a><b>id</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.ObsConfig.bandpass</td>
+                      <td class="feature-detail">provenance.Parameter.id</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Describes the spectral domain of the observation in a very general sense.  
-                        The value may be expressed in terms of general spectral bands, or specific bandpass names.  If multiple bands are covered,
-                        the value may be a comma delimited combination of appropriate bands.  If expressed as general bands, the value(s) must be
-                        selected from the enumerated set given by the SpectralBand type.  There is no controlled vocabulary for specific bandpass
-                        names as the list is too long to enumerate.  Effort should be made to use highly recognized bandpass names (eg: "U","V","B","R","I",
-                        "H-alpha").
-                        This field corresponds to both the Coverage.Spectral and Coverage.Spectral.Bandpass fields of the Resource Metadata document.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.ObsConfig.datasource"></a><b>datasource</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Parameter.value"></a><b>value</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.ObsConfig.datasource</td>
+                      <td class="feature-detail">provenance.Parameter.value</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Describes the original source of the data in a very general fashion.  In other words, "What sort of observation originally
-                        generated the data?"  Suggested values include:
-                        + survey: Survey data typically covers some region of observational parameter space with as complete as possible coverage
-                        within that region.
-                        + pointed:  Pointed data of a particular object or field.
-                        + theory:  Theory data, generated based on a theoretical model.
-                        + artificial:  Artificial, or simulated data.  Similar to 'theory', but not necessarily based on a theoretical model.
-                        + custom:  Custom data, as part of a specific research project.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">collections</td>
+                      <td colspan="3" class="info-title">references</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -2649,49 +2302,25 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="experiment.ObsConfig.facility"></a><b>facility</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Parameter.parameterDescription"></a><b>parameterDescription</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#experiment.Facility">Facility [provenance:experiment.Facility]</a></td>
+                      <td class="feature-detail"><a href="#provenance.ParameterDescription">ParameterDescription [provenance:provenance.ParameterDescription]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.ObsConfig.facility</td>
+                      <td class="feature-detail">provenance.Parameter.parameterDescription</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
                       <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Metadata pertaining to the facility performing the observation.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="experiment.ObsConfig.instrument"></a><b>instrument</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#experiment.Instrument">Instrument [provenance:experiment.Instrument]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.ObsConfig.instrument</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">Metadata pertaining to the instrument used to create the data.</td>
-                    </tr>
                   </table>
                 </td>
               </tr>
@@ -2699,17 +2328,18 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.ObsDataset"></a>2.4.10 objectType: ObsDataset
+    </div><br><h3><a name="provenance.ParameterDescription"></a>2.3.12 objectType: ParameterDescription
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">experiment.ObsDataset</td>
+          <td class="objecttype-name" colspan="1">provenance.ParameterDescription</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Abstract object extending Dataset with metadata relevant to datasets derived from Observations.
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
             
           </td>
         </tr>
@@ -2721,11 +2351,12 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment">experiment</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dataset.Dataset">Dataset [provenance:dataset.Dataset]</a></td>
+                      <td class="info-title">referrers</td>
+                      <td class="feature-detail" colspan="3"><a href="#provenance.Parameter">Parameter</a> 
+                      </td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2736,107 +2367,90 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.ObsDataset.calibLevel"></a><b>calibLevel</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ParameterDescription.id"></a><b>id</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.ObsDataset.calibLevel</td>
+                      <td class="feature-detail">provenance.ParameterDescription.id</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">High level classification for the calibration level of the particular dataset as a whole.  The calibration level concept conveys
-                        to the user information on how much data reduction/processing has been applied to the data.  It is up to the data providers
-                        to consider how to map their own internal classification to the scale defined here.
-                        Scale:
-                        * 0 - Raw instrumental data, in a proprietary or internal data-provider defined format.
-                        * 1 - Instrumental data in a standard format (FITS, VOTable, etc )
-                        * 2 - Calibrated, science ready data with the instrument signature removed.
-                        * 3 - Enhanced data products like mosaics, resampled or drizzled images, or heavily processed survey fields.  Level 3 data
-                        products may represent the combination of data from multiple primary observations.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">references</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.ObsDataset.coordSys"></a><b>coordSys</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#stc.AstroCoordSystem">AstroCoordSystem [provenance:stc.AstroCoordSystem]</a></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ParameterDescription.name"></a><b>name</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.ObsDataset.coordSys</td>
+                      <td class="feature-detail">provenance.ParameterDescription.name</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Zero or more references to coordinate system defintions associated with the dataset.  Since multiple data products may contibute
-                        to the content of a dataset, this element provides convenient, high-level access to definitions which may be distributed among
-                        lower-level objects.  
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.ObsDataset.obsConfig"></a><b>obsConfig</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ParameterDescription.annotation"></a><b>annotation</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#experiment.ObsConfig">ObsConfig [provenance:experiment.ObsConfig]</a></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.ObsDataset.obsConfig</td>
+                      <td class="feature-detail">provenance.ParameterDescription.annotation</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Reference to ObsConfig object from Observation.  This object provides some high-level metadata related to the observation
-                        configuration.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.ObsDataset.proposal"></a><b>proposal</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ParameterDescription.datatype"></a><b>datatype</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#experiment.Proposal">Proposal [provenance:experiment.Proposal]</a></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.ObsDataset.proposal</td>
+                      <td class="feature-detail">provenance.ParameterDescription.datatype</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Reference to Proposal object from Observation.  This object provides metadata identifying any proposal related to the observation
-                        which produced the dataset.
-                      </td>
+                      <td class="feature-detail"><Enter note text here></td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.ObsDataset.target"></a><b>target</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ParameterDescription.unit"></a><b>unit</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#experiment.BaseTarget">BaseTarget [provenance:experiment.BaseTarget]</a></td>
+                      <td class="feature-detail"><a href="#ivoa.Unit">Unit [provenance:ivoa.Unit]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.ObsDataset.target</td>
+                      <td class="feature-detail">provenance.ParameterDescription.unit</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -2844,61 +2458,48 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Reference to a BaseTarget object from Observation.  Provides metadata describing the target of the observation.</td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">collections</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="experiment.ObsDataset.characterisation"></a><b>characterisation</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ParameterDescription.ucd"></a><b>ucd</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#experiment.Characterisation">Characterisation [provenance:experiment.Characterisation]</a></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.ObsDataset.characterisation</td>
+                      <td class="feature-detail">provenance.ParameterDescription.ucd</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
                       <td class="feature-detail">1</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Characterisation provides a 'characteristic' view of the dataset coordinate space.  For each represented domain (spatial,
-                        spectral, temporal, etc), characterisation provides metadata summarizing the coverage, resolution, representative accuracies,
-                        etc. for the dataset asa a whole.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="experiment.ObsDataset.derived"></a><b>derived</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ParameterDescription.utype"></a><b>utype</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#experiment.Derived">Derived [provenance:experiment.Derived]</a></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.ObsDataset.derived</td>
+                      <td class="feature-detail">provenance.ParameterDescription.utype</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Provides a high level summary of certain properties of the dataset.  Its primary purpose is to support high level filtering
-                        of datasets during data discovery.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
@@ -2909,21 +2510,18 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.Observation"></a>2.4.11 objectType: Observation
+    </div><br><h3><a name="provenance.Used"></a>2.3.13 objectType: Used
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">experiment.Observation</td>
+          <td class="objecttype-name" colspan="1">provenance.Used</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Head class for an Observation Experiment.
-            The Observation is modeled as a type of 'Experiment', with some basic structure defined to provide metadata about the observation
-            target and configuration.  The product, or 'result' of the Observation is zero or more ObsDataset objects.  This pattern is
-            inspired by, and compatible with the Simulation Data Model, where a 'Simulation' can be considered another form of 'Experiment'
-            or perhaps even another form of 'Observation'.
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
             
           </td>
         </tr>
@@ -2935,7 +2533,7 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment">experiment</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2946,13 +2544,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.Observation.observationID"></a><b>observationID</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Used.role"></a><b>role</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.Observation.observationID</td>
+                      <td class="feature-detail">provenance.Used.role</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -2960,13 +2558,13 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Internal ID determined by the data provide to uniquely identify the observation within the institution or entity performing
-                        the observation.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">collections</td>
+                      <td colspan="3" class="info-title">references</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -2974,99 +2572,25 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="experiment.Observation.obsConfig"></a><b>obsConfig</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#experiment.ObsConfig">ObsConfig [provenance:experiment.ObsConfig]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.Observation.obsConfig</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">Observation configuration metadata, provides information about who, where, and how the observation was conducted.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="experiment.Observation.proposal"></a><b>proposal</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Used.usedDescription"></a><b>usedDescription</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#experiment.Proposal">Proposal [provenance:experiment.Proposal]</a></td>
+                      <td class="feature-detail"><a href="#provenance.UsedDescription">UsedDescription [provenance:provenance.UsedDescription]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.Observation.proposal</td>
+                      <td class="feature-detail">provenance.Used.usedDescription</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
                       <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">Identifies any proposal related to the observation.  This field may be used to gather all observations and products related
-                        to a particular proposal.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="experiment.Observation.result"></a><b>result</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#experiment.ObsDataset">ObsDataset [provenance:experiment.ObsDataset]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.Observation.result</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">The result of an observation is zero or more Observation Datasets.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="experiment.Observation.target"></a><b>target</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#experiment.BaseTarget">BaseTarget [provenance:experiment.BaseTarget]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.Observation.target</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">The target of the observation.  The content of this object may vary greatly depending on the goals and nature of the observation.
-                        For example, the 'target' could be a galaxy, stellar object, planet, or calibratioin source.  As such, we allow the BaseTarget
-                        class here, and permit the users to define and use more content rich flavors according to their needs.
-                      </td>
-                    </tr>
                   </table>
                 </td>
               </tr>
@@ -3074,17 +2598,18 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.Proposal"></a>2.4.12 objectType: Proposal
+    </div><br><h3><a name="provenance.UsedDescription"></a>2.3.14 objectType: UsedDescription
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">experiment.Proposal</td>
+          <td class="objecttype-name" colspan="1">provenance.UsedDescription</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Metadata related to the proposal or document which spawned the observation.
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
             
           </td>
         </tr>
@@ -3096,11 +2621,11 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment">experiment</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#experiment.ObsDataset">ObsDataset</a> 
+                      <td class="feature-detail" colspan="3"><a href="#provenance.Used">Used</a> 
                       </td>
                     </tr>
                     <tr>
@@ -3112,13 +2637,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.Proposal.identifier"></a><b>identifier</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.UsedDescription.role"></a><b>role</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.Proposal.identifier</td>
+                      <td class="feature-detail">provenance.UsedDescription.role</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -3126,7 +2651,8 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">Tag used to uniquely identify a particular proposal within the institution or entity.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
                         
                       </td>
                     </tr>
@@ -3137,17 +2663,20 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="experiment.Target"></a>2.4.13 objectType: Target
+    </div><br><h3><a name="provenance.WasAssociatedWith"></a>2.3.15 objectType: WasAssociatedWith
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">experiment.Target</td>
+          <td class="objecttype-name" colspan="1">provenance.WasAssociatedWith</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">General purpose Target object.</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
         </tr>
         <tr>
           <td colspan="2">
@@ -3157,11 +2686,7 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment">experiment</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#experiment.BaseTarget">BaseTarget [provenance:experiment.BaseTarget]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3172,23 +2697,23 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="experiment.Target.objectClass"></a><b>objectClass</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.WasAssociatedWith.role"></a><b>role</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#provenance.AgentRole">AgentRole [provenance:provenance.AgentRole]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">experiment.Target.objectClass</td>
+                      <td class="feature-detail">provenance.WasAssociatedWith.role</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">General classification or type of the target.  This field supports the discovery of data pertaining to a common class.  e.g.
-                        "Star", "Galaxy", "AGN".  At the time of this writing, there is no IVOA recommended vocabulary for this field.  The SIMBAD
-                        and NED databases use defined vocabularies for astronomical object classifications which may serve as the basis for such.
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
                       </td>
                     </tr>
                   </table>
@@ -3198,39 +2723,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="ivoa"></a>2.5 package: ivoa
-    </h3>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">ivoa</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">Base Data Types V1.0 (2014)</td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#model_section">provenance</a></td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Data types</td>
-        <td colspan="2" class="feature-detail"><a href="#ivoa.IntegerQuantity">IntegerQuantity</a> <a href="#ivoa.Quantity">Quantity</a> <a href="#ivoa.RealQuantity">RealQuantity</a> 
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Primitive types</td>
-        <td colspan="2" class="feature-detail"><a href="#ivoa.Unit">Unit</a> <a href="#ivoa.anyURI">anyURI</a> <a href="#boolean">boolean</a> <a href="#complex">complex</a> <a href="#ivoa.datetime">datetime</a> <a href="#integer">integer</a> <a href="#ivoa.nonnegativeinteger">nonnegativeinteger</a> <a href="#rational">rational</a> <a href="#ivoa.real">real</a> <a href="#string">string</a> 
-        </td>
-      </tr>
-    </table>
-    <h3><a name="ivoa.IntegerQuantity"></a>2.5.1 dataType: IntegerQuantity
+    </div><br><h3><a name="provenance.WasAttributedTo"></a>2.3.16 objectType: WasAttributedTo
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">ivoa.IntegerQuantity</td>
+          <td class="objecttype-name" colspan="1">provenance.WasAttributedTo</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -3247,11 +2746,7 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#ivoa.Quantity">Quantity [provenance:ivoa.Quantity]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3262,13 +2757,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="ivoa.IntegerQuantity.value"></a><b>value</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.WasAttributedTo.role"></a><b>role</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
+                      <td class="feature-detail"><a href="#provenance.AgentRole">AgentRole [provenance:provenance.AgentRole]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">ivoa.IntegerQuantity.value</td>
+                      <td class="feature-detail">provenance.WasAttributedTo.role</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -3288,13 +2783,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="ivoa.Quantity"></a>2.5.2 dataType: Quantity
+    </div><br><h3><a name="provenance.WasGeneratedBy"></a>2.3.17 objectType: WasGeneratedBy
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">ivoa.Quantity</td>
+          <td class="objecttype-name" colspan="1">provenance.WasGeneratedBy</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -3311,12 +2806,7 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#ivoa.IntegerQuantity">IntegerQuantity</a> <a href="#ivoa.RealQuantity">RealQuantity</a> 
-                      </td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3327,17 +2817,17 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="ivoa.Quantity.unit"></a><b>unit</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.WasGeneratedBy.role"></a><b>role</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa.Unit">Unit [provenance:ivoa.Unit]</a></td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">ivoa.Quantity.unit</td>
+                      <td class="feature-detail">provenance.WasGeneratedBy.role</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -3346,3920 +2836,131 @@
                         
                       </td>
                     </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="ivoa.RealQuantity"></a>2.5.3 dataType: RealQuantity
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">ivoa.RealQuantity</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
+                      <td colspan="3" class="info-title">references</td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#ivoa.Quantity">Quantity [provenance:ivoa.Quantity]</a></td>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="ivoa.RealQuantity.value"></a><b>value</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.WasGeneratedBy.wasGeneratedByDescription"></a><b>wasGeneratedByDescription</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa.real">real [provenance:ivoa.real]</a></td>
+                      <td class="feature-detail"><a href="#provenance.WasGeneratedByDescription">WasGeneratedByDescription [provenance:provenance.WasGeneratedByDescription]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">ivoa.RealQuantity.value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="ivoa.Unit"></a>2.5.4 primitiveType: Unit
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">ivoa.Unit</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
-      </tr>
-    </table><br><h3><a name="ivoa.anyURI"></a>2.5.5 primitiveType: anyURI
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">ivoa.anyURI</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
-      </tr>
-    </table><br><h3><a name="boolean"></a>2.5.6 primitiveType: boolean
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">boolean</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
-      </tr>
-    </table><br><h3><a name="complex"></a>2.5.7 primitiveType: complex
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">complex</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
-      </tr>
-    </table><br><h3><a name="ivoa.datetime"></a>2.5.8 primitiveType: datetime
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">ivoa.datetime</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
-      </tr>
-    </table><br><h3><a name="integer"></a>2.5.9 primitiveType: integer
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">integer</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
-      </tr>
-    </table><br><h3><a name="ivoa.nonnegativeinteger"></a>2.5.10 primitiveType: nonnegativeinteger
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">ivoa.nonnegativeinteger</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
-      </tr>
-    </table><br><h3><a name="rational"></a>2.5.11 primitiveType: rational
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">rational</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
-      </tr>
-    </table><br><h3><a name="ivoa.real"></a>2.5.12 primitiveType: real
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">ivoa.real</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
-      </tr>
-    </table><br><h3><a name="string"></a>2.5.13 primitiveType: string
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">string</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#ivoa">ivoa</a></td>
-      </tr>
-    </table><br><h3><a name="party"></a>2.6 package: party
-    </h3>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">party</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">We include a simple Party model for associating an Entity with a Role that Entity is playing.  For example, a particular Individual
-          can be both a Contact and Publisher of a dataset.
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#model_section">provenance</a></td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#party.Individual">Individual</a> <a href="#party.Organization">Organization</a> <a href="#party.Party">Party</a> <a href="#party.Role">Role</a> 
-        </td>
-      </tr>
-    </table>
-    <h3><a name="party.Individual"></a>2.6.1 objectType: Individual
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">party.Individual</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Abstract head of the sub-set of Parties which describe a single individual.</td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#party">party</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#party.Party">Party [provenance:party.Party]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#dataset.Contact">Contact</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
+                      <td class="feature-detail">provenance.WasGeneratedBy.wasGeneratedByDescription</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="party.Individual.address"></a><b>address</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">party.Individual.address</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">Mailing address for the person.  The value is expressed as a single string containing all components of the address. </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="party.Individual.phone"></a><b>phone</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">party.Individual.phone</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">Phone number associated with the person.  The value is expressed as a string according to the format appropriate for the locale.</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="party.Individual.email"></a><b>email</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">party.Individual.email</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">E-mail address of the Individual</td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="party.Organization"></a>2.6.2 objectType: Organization
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">party.Organization</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Extension of Party for any Organization or Institution.</td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#party">party</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#party.Party">Party [provenance:party.Party]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#experiment.Facility">Facility</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="party.Organization.address"></a><b>address</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">party.Organization.address</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">Mailing address.  The value is expressed as a single string containing all components of the address. 
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="party.Organization.phone"></a><b>phone</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">party.Organization.phone</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">Phone number.  The value is expressed as a string according to the format appropriate for the locale.</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="party.Organization.email"></a><b>email</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">party.Organization.email</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">E-mail address of the Organization.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="party.Organization.logo"></a><b>logo</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa.anyURI">anyURI [provenance:ivoa.anyURI]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">party.Organization.logo</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">URL pointer to a graphical logo associated with the Organization.</td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="party.Party"></a>2.6.3 objectType: Party
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">party.Party</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Abstract head of the set of classes describing various entities. </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#party">party</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#party.Individual">Individual</a> <a href="#party.Organization">Organization</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#party.Role">Role</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="party.Party.name"></a><b>name</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">party.Party.name</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">Name of the Party or entity.  All entities are assumed to have a name.</td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="party.Role"></a>2.6.4 objectType: Role
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">party.Role</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">Abstract class for the entity role.  Models should extend this class to define local roles which are played by various entities/parties.</td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#party">party</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#dataset.Contact">Contact</a> <a href="#dataset.Contributor">Contributor</a> <a href="#dataset.Creator">Creator</a> <a href="#experiment.Facility">Facility</a> <a href="#dataset.Publisher">Publisher</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">references</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="party.Role.party"></a><b>party</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#party.Party">Party [provenance:party.Party]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">party.Role.party</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">Reference to the Party or Entity which is associated with this role.</td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance"></a>2.7 package: provenance
-    </h3>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">provenance</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#model_section">provenance</a></td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#provenance.Activity">Activity</a> <a href="#provenance.ActivityDescription">ActivityDescription</a> <a href="#provenance.ActivityFlow">ActivityFlow</a> <a href="#provenance.Agent">Agent</a> <a href="#provenance.Collection">Collection</a> <a href="#provenance.Entity">Entity</a> <a href="#provenance.EntityDescription">EntityDescription</a> <a href="#provenance.HadMember">HadMember</a> <a href="#provenance.HadStep">HadStep</a> <a href="#provenance.Parameter">Parameter</a> <a href="#provenance.ParameterDescription">ParameterDescription</a> <a href="#provenance.Used">Used</a> <a href="#provenance.UsedDescription">UsedDescription</a> <a href="#provenance.WasAssociatedWith">WasAssociatedWith</a> <a href="#provenance.WasAttributedTo">WasAttributedTo</a> <a href="#provenance.WasGeneratedBy">WasGeneratedBy</a> <a href="#provenance.WasGeneratedByDescription">WasGeneratedByDescription</a> 
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Enumerations</td>
-        <td colspan="2" class="feature-detail"><a href="#provenance.AgentRole">AgentRole</a> 
-        </td>
-      </tr>
-    </table>
-    <h3><a name="provenance.Activity"></a>2.7.1 objectType: Activity
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.Activity</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#provenance.ActivityFlow">ActivityFlow</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#provenance.Activity">Activity</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Activity.id"></a><b>id</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Activity.id</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Activity.label"></a><b>label</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Activity.label</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Activity.startTime"></a><b>startTime</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Activity.startTime</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Activity.endTime"></a><b>endTime</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Activity.endTime</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Activity.annotation"></a><b>annotation</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Activity.annotation</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">references</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Activity.activity"></a><b>activity</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.Activity">Activity [provenance:provenance.Activity]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Activity.activity</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Activity.activityDescription"></a><b>activityDescription</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.ActivityDescription">ActivityDescription [provenance:provenance.ActivityDescription]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Activity.activityDescription</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">collections</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Activity.parameter"></a><b>parameter</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.Parameter">Parameter [provenance:provenance.Parameter]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Activity.parameter</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Activity.used"></a><b>used</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.Used">Used [provenance:provenance.Used]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Activity.used</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Activity.wasAssociatedWith"></a><b>wasAssociatedWith</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.WasAssociatedWith">WasAssociatedWith [provenance:provenance.WasAssociatedWith]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Activity.wasAssociatedWith</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Activity.wasGeneratedBy"></a><b>wasGeneratedBy</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.WasGeneratedBy">WasGeneratedBy [provenance:provenance.WasGeneratedBy]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Activity.wasGeneratedBy</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance.ActivityDescription"></a>2.7.2 objectType: ActivityDescription
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.ActivityDescription</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#provenance.Activity">Activity</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ActivityDescription.id"></a><b>id</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ActivityDescription.id</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ActivityDescription.label"></a><b>label</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ActivityDescription.label</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ActivityDescription.type"></a><b>type</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ActivityDescription.type</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ActivityDescription.subtype"></a><b>subtype</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ActivityDescription.subtype</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ActivityDescription.description"></a><b>description</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ActivityDescription.description</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ActivityDescription.docuLink"></a><b>docuLink</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa.anyURI">anyURI [provenance:ivoa.anyURI]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ActivityDescription.docuLink</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">collections</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.ActivityDescription.parameterDescription"></a><b>parameterDescription</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.ParameterDescription">ParameterDescription [provenance:provenance.ParameterDescription]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ActivityDescription.parameterDescription</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.ActivityDescription.usedDescription"></a><b>usedDescription</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.UsedDescription">UsedDescription [provenance:provenance.UsedDescription]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ActivityDescription.usedDescription</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.ActivityDescription.wasGeneratedByDescription"></a><b>wasGeneratedByDescription</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.WasGeneratedByDescription">WasGeneratedByDescription [provenance:provenance.WasGeneratedByDescription]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ActivityDescription.wasGeneratedByDescription</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance.ActivityFlow"></a>2.7.3 objectType: ActivityFlow
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.ActivityFlow</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance.Activity">Activity [provenance:provenance.Activity]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">collections</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.ActivityFlow.hadStep"></a><b>hadStep</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.HadStep">HadStep [provenance:provenance.HadStep]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ActivityFlow.hadStep</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance.Agent"></a>2.7.4 objectType: Agent
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.Agent</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Agent.id"></a><b>id</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Agent.id</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Agent.name"></a><b>name</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Agent.name</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">collections</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Agent.party"></a><b>party</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#party.Party">Party [provenance:party.Party]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Agent.party</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Agent.wasAssociatedWith"></a><b>wasAssociatedWith</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.WasAssociatedWith">WasAssociatedWith [provenance:provenance.WasAssociatedWith]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Agent.wasAssociatedWith</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Agent.wasAttributedTo"></a><b>wasAttributedTo</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.WasAttributedTo">WasAttributedTo [provenance:provenance.WasAttributedTo]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Agent.wasAttributedTo</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance.AgentRole"></a>2.7.5 enumeration: AgentRole
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="2">provenance.AgentRole</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="2">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-      </tr>
-      <tr>
-        <td colspan="3" class="info-title" align="center">literals</td>
-      </tr>
-      <tr>
-        <td class="feature-heading" width="25%">name</td>
-        <td class="feature-heading" width="25%">feature</td>
-        <td class="feature-heading" width="50%">value</td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="provenance.AgentRole.Observer"></a>Observer
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">provenance.AgentRole.Observer</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="provenance.AgentRole.Creator"></a>Creator
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">provenance.AgentRole.Creator</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="provenance.AgentRole.Author"></a>Author
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">provenance.AgentRole.Author</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="provenance.AgentRole.Editor"></a>Editor
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">provenance.AgentRole.Editor</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="provenance.AgentRole.Publisher"></a>Publisher
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">provenance.AgentRole.Publisher</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="provenance.AgentRole.Operator"></a>Operator
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">provenance.AgentRole.Operator</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="provenance.AgentRole.Coordinator"></a>Coordinator
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">provenance.AgentRole.Coordinator</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail" rowspan="2" valign="top"><a name="provenance.AgentRole.Provider"></a>Provider
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">provenance.AgentRole.Provider</td>
-      </tr>
-      <tr>
-        <td class="feature-heading">description</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-    </table><br><h3><a name="provenance.Collection"></a>2.7.6 objectType: Collection
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.Collection</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance.Entity">Entity [provenance:provenance.Entity]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">collections</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Collection.hadMember"></a><b>hadMember</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.HadMember">HadMember [provenance:provenance.HadMember]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Collection.hadMember</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance.Entity"></a>2.7.7 objectType: Entity
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.Entity</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#provenance.Collection">Collection</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#provenance.Entity">Entity</a> <a href="#provenance.HadMember">HadMember</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Entity.id"></a><b>id</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Entity.id</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Entity.label"></a><b>label</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Entity.label</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Entity.type"></a><b>type</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Entity.type</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Entity.annotation"></a><b>annotation</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Entity.annotation</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Entity.access"></a><b>access</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Entity.access</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">references</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Entity.entityDescription"></a><b>entityDescription</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.EntityDescription">EntityDescription [provenance:provenance.EntityDescription]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Entity.entityDescription</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Entity.progenitor"></a><b>progenitor</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.Entity">Entity [provenance:provenance.Entity]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Entity.progenitor</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">collections</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Entity.used"></a><b>used</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.Used">Used [provenance:provenance.Used]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Entity.used</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Entity.wasAttributedTo"></a><b>wasAttributedTo</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.WasAttributedTo">WasAttributedTo [provenance:provenance.WasAttributedTo]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Entity.wasAttributedTo</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.Entity.wasGeneratedBy"></a><b>wasGeneratedBy</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.WasGeneratedBy">WasGeneratedBy [provenance:provenance.WasGeneratedBy]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Entity.wasGeneratedBy</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance.EntityDescription"></a>2.7.8 objectType: EntityDescription
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.EntityDescription</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#provenance.Entity">Entity</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.EntityDescription.id"></a><b>id</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.EntityDescription.id</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.EntityDescription.label"></a><b>label</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.EntityDescription.label</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.EntityDescription.annotation"></a><b>annotation</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.EntityDescription.annotation</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.EntityDescription.dataproduct_type"></a><b>dataproduct_type</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.EntityDescription.dataproduct_type</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.EntityDescription.dataproduct_subtype"></a><b>dataproduct_subtype</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.EntityDescription.dataproduct_subtype</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.EntityDescription.level"></a><b>level</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#integer">integer [provenance:integer]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.EntityDescription.level</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.EntityDescription.docu_link"></a><b>docu_link</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa.anyURI">anyURI [provenance:ivoa.anyURI]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.EntityDescription.docu_link</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">collections</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.EntityDescription.dataset"></a><b>dataset</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#Dataset Metadata">Dataset Metadata</a>:<a href="#dataset">dataset</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.EntityDescription.dataset</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.EntityDescription.usedDescription"></a><b>usedDescription</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.UsedDescription">UsedDescription [provenance:provenance.UsedDescription]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.EntityDescription.usedDescription</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.EntityDescription.wasGeneratedByDescription"></a><b>wasGeneratedByDescription</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.WasGeneratedByDescription">WasGeneratedByDescription [provenance:provenance.WasGeneratedByDescription]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.EntityDescription.wasGeneratedByDescription</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance.HadMember"></a>2.7.9 objectType: HadMember
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.HadMember</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">references</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.HadMember.entity"></a><b>entity</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.Entity">Entity [provenance:provenance.Entity]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.HadMember.entity</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance.HadStep"></a>2.7.10 objectType: HadStep
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.HadStep</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">collections</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="provenance.HadStep.activity"></a><b>activity</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.Activity">Activity [provenance:provenance.Activity]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.HadStep.activity</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance.Parameter"></a>2.7.11 objectType: Parameter
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.Parameter</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Parameter.id"></a><b>id</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Parameter.id</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Parameter.value"></a><b>value</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Parameter.value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">references</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Parameter.parameterDescription"></a><b>parameterDescription</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.ParameterDescription">ParameterDescription [provenance:provenance.ParameterDescription]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Parameter.parameterDescription</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance.ParameterDescription"></a>2.7.12 objectType: ParameterDescription
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.ParameterDescription</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#provenance.Parameter">Parameter</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ParameterDescription.id"></a><b>id</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ParameterDescription.id</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ParameterDescription.label"></a><b>label</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ParameterDescription.label</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ParameterDescription.annotation"></a><b>annotation</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ParameterDescription.annotation</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ParameterDescription.datatype"></a><b>datatype</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ParameterDescription.datatype</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail"><Enter note text here></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ParameterDescription.unit"></a><b>unit</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa.Unit">Unit [provenance:ivoa.Unit]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ParameterDescription.unit</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ParameterDescription.ucd"></a><b>ucd</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ParameterDescription.ucd</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.ParameterDescription.utype"></a><b>utype</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.ParameterDescription.utype</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance.Used"></a>2.7.13 objectType: Used
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.Used</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">references</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.Used.usedDescription"></a><b>usedDescription</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.UsedDescription">UsedDescription [provenance:provenance.UsedDescription]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.Used.usedDescription</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance.UsedDescription"></a>2.7.14 objectType: UsedDescription
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.UsedDescription</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#provenance.Used">Used</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.UsedDescription.role"></a><b>role</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.UsedDescription.role</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance.WasAssociatedWith"></a>2.7.15 objectType: WasAssociatedWith
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.WasAssociatedWith</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.WasAssociatedWith.role"></a><b>role</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.AgentRole">AgentRole [provenance:provenance.AgentRole]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.WasAssociatedWith.role</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance.WasAttributedTo"></a>2.7.16 objectType: WasAttributedTo
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.WasAttributedTo</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.WasAttributedTo.role"></a><b>role</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.AgentRole">AgentRole [provenance:provenance.AgentRole]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.WasAttributedTo.role</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance.WasGeneratedBy"></a>2.7.17 objectType: WasGeneratedBy
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.WasGeneratedBy</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">references</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.WasGeneratedBy.wasGeneratedByDescription"></a><b>wasGeneratedByDescription</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#provenance.WasGeneratedByDescription">WasGeneratedByDescription [provenance:provenance.WasGeneratedByDescription]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.WasGeneratedBy.wasGeneratedByDescription</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="provenance.WasGeneratedByDescription"></a>2.7.18 objectType: WasGeneratedByDescription
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">provenance.WasGeneratedByDescription</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#provenance.WasGeneratedBy">WasGeneratedBy</a> 
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.WasGeneratedByDescription.role"></a><b>role</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">provenance.WasGeneratedByDescription.role</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="stc"></a>2.8 package: stc
-    </h3>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">stc</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">Space-Time Coordinates (STC) Model protoype V2.0</td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#model_section">provenance</a></td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#stc.AstroCoordSystem">AstroCoordSystem</a> 
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Data types</td>
-        <td colspan="2" class="feature-detail"><a href="#stc.Position">Position</a> 
-        </td>
-      </tr>
-    </table>
-    <h3><a name="stc.AstroCoordSystem"></a>2.8.1 objectType: AstroCoordSystem
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">stc.AstroCoordSystem</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#stc">stc</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#experiment.ObsDataset">ObsDataset</a> 
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="stc.Position"></a>2.8.2 dataType: Position
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">stc.Position</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#stc">stc</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><hr>
-    <h1>3.<a name="vodml-ids">Element Identifiers/VO-DMLrefs</a></h1>  
-    The following table shows all fully qualified vodml-ids for this data model.
-    It is ordered alphabetically and the identifiers are hyper-linked to the location
-    in the document where the actual element is fully defined.
-    
-    
-    <table style="border-style:solid;border-width:1px;" border="1" cellspacing="0" cellpadding="0">
-      <tr>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-heading">feature type</td>
-        <td class="feature-heading">description</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#"></a></td>
-        <td class="feature-detail">vo-dml:model</td>
-        <td class="feature-detail">This document provides a data model describing the structure and content of generic Dataset metadata for the IVOA.  This is
-          a high-level model which is to be referenced and extended by other models describing specific types of Datasets and Data products.
-          In this document, we specify the generic Dataset, as well as an ObservationDataset model which covers the class of Datasets
-          which are derived from an Observation.  At the time of this writing, there is no formal Observation-Experiment model for the
-          IVOA, so we include a hypothetical Observation-Experiment model to serve as a placeholder. 
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#char">char</a></td>
-        <td class="feature-detail">package</td>
-        <td class="feature-detail">Characterisation Model V1.13 (2008)</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#char.Char">char.Char</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset">dataset</a></td>
-        <td class="feature-detail">package</td>
-        <td class="feature-detail">Dataset Metadata package</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Collection">dataset.Collection</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">A generic organizational construct which allows Datasets to be associated with each other by a set of Collection properties.
-          Datasets tagged with the same Collection properies can be assumed to have some degree of compatibility.
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Collection.name">dataset.Collection.name</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">The values are generally defined by the creating entity.  Examples: "WFC", "Sloan", "BFS Spectrograph", "MSX Galactic Plane
-          Survey".
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Contact">dataset.Contact</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Contact information for a person or entity.
-          
-          Contact is modeled as a Role played by a particular person or entity (Party).  We subset the type of Party to include only
-          Individuals.  This includes both a physical person, or proxy service such as a helpdesk.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Contact.party">dataset.Contact.party</a></td>
-        <td class="feature-detail">reference</td>
-        <td class="feature-detail">Reference to the Individual associated with this role.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Contributor">dataset.Contributor</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Contributor is modeled as a Role played by a Party or entity who participated in the generation of the Dataset.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Contributor.acknowledgment">dataset.Contributor.acknowledgment</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Acknowledgment expression for the contributor.  Users of the dataset should include these in subsequent credits and acknowledgements.
-          The expression should be formatted as desired by the contributor.
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.CreationType">dataset.CreationType</a></td>
-        <td class="feature-detail">enumeration</td>
-        <td class="feature-detail">Enumeration of dataset creation types.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.CreationType.ARCHIVAL">dataset.CreationType.ARCHIVAL</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">Indicates that it is one of a collection of datasets generated in a systematic, homogeneous way and is stored statically (or
-          at least versioned).  It will be possible to regenerate this dataset at a later date.  The remaining types imply on-the-fly
-          manipulation.
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.CreationType.CATALOG_EXTRACTION">dataset.CreationType.CATALOG_EXTRACTION</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">Has been extracted from a catalog.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.CreationType.CUTOUT">dataset.CreationType.CUTOUT</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">Indicates that the dataset was created "on-the-fly", by subsetting, but not by modifying values.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.CreationType.FILTERED">dataset.CreationType.FILTERED</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">May involve excluding data prior to binning into samples, also "on-the-fly"
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.CreationType.MOSAIC">dataset.CreationType.MOSAIC</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">Combines multiple original datasets "on-the-fly"</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.CreationType.SPECTRAL_EXTRACTION">dataset.CreationType.SPECTRAL_EXTRACTION</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">Has been extracted, for example, from a spectral data cube.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Creator">dataset.Creator</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Creator is modeled as a Role played by the organization or entity which created the Dataset.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Curation">dataset.Curation</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">The Curation object provides metadata assigned by the entity responsible for the support of the dataset content as well as
-          identifying metadata about that entity.  It is assembled from definitions provided by the IVOA standard document, "Resource
-          Metadata for the Virtual Observatory; Version 1.12"  (Resource Metadata).  Here, we provide a brief description of each field
-          for easy reference, along with a notation of its mapping to the Resource Metadata document (RM:field), where the reader may
-          find more detailed information.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Curation.contact">dataset.Curation.contact</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">Contact information of the person/entity responsible for the content of the dataset.  We recommend using a generic 'helpdesk'
-          type contact rather than individuals whose information may more easily become obsolete. (RM:Curation.Contact)
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Curation.publisher">dataset.Curation.publisher</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">The entity making the data available.  (RM:Curation.Publisher)</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Curation.publisherDID">dataset.Curation.publisherDID</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">IVOA dataset identifier assigned by the publisher to uniquely identify the dataset within its holdings.  Typically, the basis
-          of this identifier will be the publisher ID.  However, if the publisherchooses to use a 'global index service' such as ADS
-          to obtain persistent identifiers for their datasets, rather than generate their own, that identifier should be used both here
-          and for DataID.datasetID.  Note: this model also defines a creator dataset ID (DataID.creatorDID), these will differ if the
-          publishing entity is not the creator of the dataset.  Values are to be expressed as dataset identifiers using the syntax described
-          in "IVOA Identifiers"
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Curation.reference">dataset.Curation.reference</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">Zero or more bibliographic or documentation references associated with the dataset.  Each instance provides a single forward
-          link to a major publication which references the dataset.  (RM:General.Source)
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Curation.releaseDate">dataset.Curation.releaseDate</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Date the curated dataset was last modified.  (RM:Curation.Date)</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Curation.rights">dataset.Curation.rights</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Curation.version">dataset.Curation.version</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Version of the curated dataset, assigned by the publisher.  This is an independent versioning from DataID.version that allows
-          the publisher to track changes to the high level dataset metadata (e.g. curation metadata, identifiers, etc.) without effecting
-          the creator defined dataset version.  The value may be based on the DataID.version (e.g. by adding a sub-version extension),
-          or an independent versioning.  There are no format restrictions on the value.  (RM:Curation.Version)
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataID">dataset.DataID</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">The Data Identification object (DataID) stores the dataset identifiers and other metadata typically assigned by the dataset
-          creator.
-          	The Dataset IDs in this object must comply with the syntax for dataset identifiers defined in the "IVOA Identifiers" document,
-          including the use of 'stop' characters to identify specific datasets that are not individually in the registry.   e.g., ivo://example.net/aservice?2013/5/2342.
-          	Much of the content of this object is assembled from various definitions in the IVAO Resource Metadata document.  Here, we
-          provide a brief description of each field for easy reference, along with a notation of its mapping to the Resource Metadata
-          document (RM:field), where the reader may find more detailed information.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataID.collection">dataset.DataID.collection</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">The dataset is associated with zero or more Collections (instrument name, survey name, etc.) .  Each instance identifies a
-          tag indicating some degree of compatibility with other data sharing the same Collection properties.
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataID.contributor">dataset.DataID.contributor</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">Persons or entities who contributed to the generation of the scientific content of the dataset.  Users of the dataset should
-          include these in subsequent credits and acknowledgements. (RM:Curation.Contributor)
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataID.creationType">dataset.DataID.creationType</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">The dataset creation type describes the nature or genre of the content.  (RM:General.Type).
-          Note: This field provides information about the process by which the dataset was created.  As the Observation/Experiment model
-          matures, this may evolve into a provenance element on the Experiment type.
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataID.creator">dataset.DataID.creator</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">The institution or entity which created the dataset.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataID.creatorDID">dataset.DataID.creatorDID</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">The dataset identifier assigned by the creator.  Here, the authority-id of the identifier must be that of the creator.  It
-          is used to identify the original exposure of the dataset in an archive, and will remain static regardless of where the dataset
-          is published.  The creator ID will not necessarily change even if the VO object in question is a cutout or is otherwise further
-          processed.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataID.datasetID">dataset.DataID.datasetID</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">If the dataset is registered with an external 'global index service' such as ADS, the publisher may include that identifier
-          here.  This provides a common, persistent identifier for the dataset, and possible access point to follow for information
-          on publications and other related datasets.  Note: the same dataset published at more than one location would have different
-          Curation.publisherDID values, but the same DataID.datasetID.  eg: "ivo://ADS/Sa.CXO?obsid=1234", "ivo://ADS/sh.hut#ngc4151_141"
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataID.date">dataset.DataID.date</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Data processing or creation date (RM:Curation.Date).</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataID.title">dataset.DataID.title</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">A free form string giving a title for the dataset.  (RM:Identity.Title)</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataID.version">dataset.DataID.version</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Version assigned by the creator, reflecting the production version of the dataset.  This value should only be changed by the
-          creator, upon the new release of a dataset.  There are no format restrictions or specifications on the versioning scheme.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataModel">dataset.DataModel</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">This object provides specific information regarding the data model and version thereof that a dataset represents.  This information
-          is primarily an aide to (de)serialization of the dataset.  As such, it would better be defined by serialization conventions.
-          In lieu of such conventions, we include this object and representative serialization examples for the primary file formats
-          VOTable and FITS.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataModel.URL">dataset.DataModel.URL</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">URL pointer to the XML schema associated with the model.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataModel.name">dataset.DataModel.name</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Formatted string providing the name and version of the model document.  The format speficication is "[name]-[version].[subversion]".
-          Each derived model should specifically state the appropriate string for this field.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataModel.prefix">dataset.DataModel.prefix</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Prefix string used in UType string for elements associated with the model.  For IVOA standard models, this will be a predetermined
-          string (e.g. 'stc' or 'spec').  Extended, or user defined content can specify a unique prefix for their own content.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataProductType">dataset.DataProductType</a></td>
-        <td class="feature-detail">enumeration</td>
-        <td class="feature-detail">Enumeration identifying the high level classification of a data product.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataProductType.CATALOG">dataset.DataProductType.CATALOG</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">A catalog.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataProductType.CUBE">dataset.DataProductType.CUBE</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">A multidimensional astronomical image of three (3) or more axes.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataProductType.EVENT">dataset.DataProductType.EVENT</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">An event counting dataset (e.g. X-ray). An event dataset may contain data with spatial, spectral, and time information for
-          each measured event. 
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataProductType.IMAGE">dataset.DataProductType.IMAGE</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">A two (2) dimensional astronomical image.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataProductType.PHOTOMETRY">dataset.DataProductType.PHOTOMETRY</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">Dataset with spectral coverage with irregular gaps.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataProductType.SED">dataset.DataProductType.SED</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">A spectral energy distribution, an advanced data product often produced by combining data from multiple observations.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataProductType.SPECTRUM">dataset.DataProductType.SPECTRUM</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">Dataset where spectral coverage is the primary attribute, in contiguous bins. e.g. a 1D spectrum or a long slit spectrum.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataProductType.TIMESERIES">dataset.DataProductType.TIMESERIES</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">Dataset presenting some quantity varying as a function of time.  A light curve is a typical example of a timeseries dataset.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.DataProductType.VISIBILITY">dataset.DataProductType.VISIBILITY</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">A visibility (radio) dataset. Typically this is instrumental data, and is often a complex object containing multiple files
-          or other substructures.  A visibility dataset may contain data with spatial, spectral, time, and polarization information
-          for each measured visibility.
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Dataset">dataset.Dataset</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Abstract object for the generic IVOA Dataset.  It is intended to be useful for any type of data.  Specific dataset models
-          should extend this object, providing detailed definitions and additional content as appropriate for that type of dataset.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Dataset.curation">dataset.Dataset.curation</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">Provides metadata related to the entity responsible for the curation of the dataset.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Dataset.dataID">dataset.Dataset.dataID</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">DataID provides high level identification metadata for the dataset itself, and any associations with various collections.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Dataset.dataProductSubtype">dataset.Dataset.dataProductSubtype</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Secondary type classification for the dataset.  This field is intended to precisely specify the scientific nature of the data
-          product, possibly in terms relevant only to a specific archive or data collection.  For example, dataProductType='image' could
-          have associated dataProductSubtype="src.image", "bkg.image", "PixelMask", etc.  Values are unrestricted strings.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Dataset.dataProductType">dataset.Dataset.dataProductType</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Describes the high level scientific classification of the data content.  Values are restricted to the DataProductType enumeration
-          set and convey the general idea of the content and organization of
-          a dataset.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Publication">dataset.Publication</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Any referenceable publication associated with a Dataset.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Publication.refCode">dataset.Publication.refCode</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Reference code of the publication.  Values should be expressed as a URL, or bibcode (discernible as a 19 character string
-          beginning with 4 digits).  Free text references are allowed, but discouraged.
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Publisher">dataset.Publisher</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Publisher is modeled as a Role played by the organization or entity making the Dataset available.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.Publisher.publisherID">dataset.Publisher.publisherID</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">IVOA resource identifier associated with the publisher and registered with an IVOA compliant registry  (eg: ivo://mast.stsci.edu).
-          Values are to be expressed using the syntax described in "IVOA Identifiers".
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.RightsType">dataset.RightsType</a></td>
-        <td class="feature-detail">enumeration</td>
-        <td class="feature-detail">Enumeration of access rights levels.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.RightsType.PROPRIETARY">dataset.RightsType.PROPRIETARY</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">only proprietary access is allowed with authentication. 
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.RightsType.PUBLIC">dataset.RightsType.PUBLIC</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">unrestricted, public access is allowed, without authentication.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.RightsType.SECURE">dataset.RightsType.SECURE</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">authenticated, public access is allowed.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.SpectralBandType">dataset.SpectralBandType</a></td>
-        <td class="feature-detail">enumeration</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.SpectralBandType.GAMMARAY">dataset.SpectralBandType.GAMMARAY</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">E ≥ 120keV</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.SpectralBandType.INFRARED">dataset.SpectralBandType.INFRARED</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">1 μ ≤ λ ≤ 100 μ</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.SpectralBandType.MILLIMETER">dataset.SpectralBandType.MILLIMETER</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">0.1 mm ≤ λ ≤ 10 mm; 3000 GHz ≥ ν ≥ 30 GHz
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.SpectralBandType.OPTICAL">dataset.SpectralBandType.OPTICAL</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">0.3 μ ≤ λ ≤ 1 μ
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.SpectralBandType.RADIO">dataset.SpectralBandType.RADIO</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">λ ≥ 10 mm; ν ≤ 30 GHz</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.SpectralBandType.ULTRAVIOLET">dataset.SpectralBandType.ULTRAVIOLET</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">100 Å ≤ λ ≤ 3000 Å; 1.2 eV ≤ E ≤ 120 eV
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#dataset.SpectralBandType.XRAY">dataset.SpectralBandType.XRAY</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">0.1 Å ≤ λ ≤ 100 Å; 0.12 keV ≤ E ≤ 120 keV
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment">experiment</a></td>
-        <td class="feature-detail">package</td>
-        <td class="feature-detail">The Observation Experiment model refers to several elements related to an Observation and its configuration.  As of the time
-          of this writing, there is no IVOA recommendation for a general Observation data model.  The Provenance data model, in progress,
-          will define the pattern for describing the relation between actions and results, and how to record these in datasets.  In
-          lieu of these standards, this document defines a straw-man Observation model.  
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.AstroTarget">experiment.AstroTarget</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Extension of BaseTarget specialized for astronomical objects.  The AstroTarget defines additional astronomical properties
-          of the target.
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.AstroTarget.objectClass">experiment.AstroTarget.objectClass</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">General classification or type of the target.  This field supports the discovery of data pertaining to a common class.  e.g.
-          "Star", "Galaxy", "AGN".  At the time of this writing, there is no IVOA recommended vocabulary for this field.  The SIMBAD
-          and NED databases use defined vocabularies for astronomical object classifications which may serve as the basis for such.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.AstroTarget.redshift">experiment.AstroTarget.redshift</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">This field gives the canonical redshift of the astronomical object.  It is normally used to store the cosmological redshift
-          of extragalactic objects, although it may also be used to store the observed redshift of Galactic sources if that information
-          is felt by the data provider to be useful.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.AstroTarget.spectralClass">experiment.AstroTarget.spectralClass</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Spectral class of the object.  As with objectClass, there is no IVOA recommended vocabulary for specifying the spectral class
-          of an object.  There is an IVOA Note on the subject entitled "An encoding system to represent stellar spectral classes in
-          archival databases and catalogs", describing an encoding system which has been adopted by the MAST archive.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.AstroTarget.varAmpl">experiment.AstroTarget.varAmpl</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Canonical variability amplitude attributed to the target.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.BaseTarget">experiment.BaseTarget</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Abstract base class for the Target object tree.  The target object provides identifying metadata related to the subject or
-          goal of the experiment.  For an Observational experiment, this would typically be an astronomical object.  The BaseTarget
-          class defines high-level identifying information, and must be extended for particular classes of Target which may define additional
-          characteristics.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.BaseTarget.description">experiment.BaseTarget.description</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Free form description of target.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.BaseTarget.name">experiment.BaseTarget.name</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">The target name.  The primary purpose of this field is to provide the user with a recognizable identity of the particular
-          subject or goal.  However, since this may be a query-able field in data discovery protocols, care should be taken to use values
-          which follow conventions for the domain appropriate for the data.  For an astronomical object, this may be a name suitable
-          for use within a domain-specific resolution service.  Simulated data might also use this sort of name (if simulating a particular
-          object), or a more generic term such as "G2V star". 
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.BaseTarget.position">experiment.BaseTarget.position</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">This field provides the spatial location of the target.  The value is an STC Position object which supports all required dimensionality
-          and coordinate frame specification needs.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.Characterisation">experiment.Characterisation</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">This Characterisation object is a direct extension of the Characterisation object from the IVOA Characterisation Data Model
-          Standard.  This provides a local object which may be contained in a 'composition' relation to other objects of this model
-          (specifically ObsDataset).  This object may be extended and/or modified by specific Dataset models as needed.
-          	Characterisation provides a broad scale description of the coordinate space occupied by the dataset in each of the axis domains.
-          This includes axes not directly represented in the dataset 'data', for example, the Time axis of a 2D special image.  As such,
-          there is a strong correlation between Characterisation and Data objects.  In some cases, the values may be directly derived
-          from the Data, in others, they provide supporting metadata about the broader domain.  For example, the Accuracy fields in
-          Characterisation represent typical accuracy for the dataset, while those within Data provide per-data-point errors.   
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.Derived">experiment.Derived</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">The Derived (short for Derived Data) object holds derived information obtained by evaluating or analyzing the contents of
-          the dataset.  The specific content of this object is strongly dependent on the specific type of dataset, so we provide a generic
-          model which may be specialized in other models to define elements appropriate for that type of dataset.
-          
-          The primary purpose of this object is to provide a common framework in which specific information may be placed to aid in
-          discovery and filtering of datasets in various access protocols.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.Derived.derivedElement">experiment.Derived.derivedElement</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">Collection of zero or more DerivedElement objects, each of which provides a specific quantity obtained by analyzing the dataset
-          content.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.DerivedElement">experiment.DerivedElement</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Abstract base for defining derived data elements.  Typically, models for specific data products would extend this object to
-          define various elements appropriate for that model.  For example, the Spectrum model could define signal-to-noise ratio (SNR),
-          or TimeSeries could define period, or variability.  We put no restriction on the DerivedElement content since the result could
-          be a simple value or a complex object.  However, it is recommended that extensions be simple and compact in keeping with the
-          primary intent of use in data discovery.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.DerivedScalar">experiment.DerivedScalar</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Simple extension of DerivedElement class which can serve many use cases.  Usages of this object in other models to define
-          specific elements should explicitly define the element name, and the process by which the value is determined.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.DerivedScalar.name">experiment.DerivedScalar.name</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Name identifying the derived element.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.DerivedScalar.value">experiment.DerivedScalar.value</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Value of the derived element.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.Facility">experiment.Facility</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Facility performing the observation.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.Facility.party">experiment.Facility.party</a></td>
-        <td class="feature-detail">reference</td>
-        <td class="feature-detail">Reference to the Party or Entity which is associated with this role.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.Instrument">experiment.Instrument</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Identifies the instrument used to create the data.  This can be a specific instrument name, general type or something else,
-          such as a program in the case of theoretical data.   (RM:Collection.Instrument) 
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.Instrument.name">experiment.Instrument.name</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Name of the instrument.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.ObsConfig">experiment.ObsConfig</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">ObsConfig describes all Observation Configuration metadata.  We define a small set of configuration elements which are required
-          as Provenance in the observation dataset.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.ObsConfig.bandpass">experiment.ObsConfig.bandpass</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Describes the spectral domain of the observation in a very general sense.  
-          The value may be expressed in terms of general spectral bands, or specific bandpass names.  If multiple bands are covered,
-          the value may be a comma delimited combination of appropriate bands.  If expressed as general bands, the value(s) must be
-          selected from the enumerated set given by the SpectralBand type.  There is no controlled vocabulary for specific bandpass
-          names as the list is too long to enumerate.  Effort should be made to use highly recognized bandpass names (eg: "U","V","B","R","I",
-          "H-alpha").
-          This field corresponds to both the Coverage.Spectral and Coverage.Spectral.Bandpass fields of the Resource Metadata document.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.ObsConfig.datasource">experiment.ObsConfig.datasource</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Describes the original source of the data in a very general fashion.  In other words, "What sort of observation originally
-          generated the data?"  Suggested values include:
-          + survey: Survey data typically covers some region of observational parameter space with as complete as possible coverage
-          within that region.
-          + pointed:  Pointed data of a particular object or field.
-          + theory:  Theory data, generated based on a theoretical model.
-          + artificial:  Artificial, or simulated data.  Similar to 'theory', but not necessarily based on a theoretical model.
-          + custom:  Custom data, as part of a specific research project.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.ObsConfig.facility">experiment.ObsConfig.facility</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">Metadata pertaining to the facility performing the observation.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.ObsConfig.instrument">experiment.ObsConfig.instrument</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">Metadata pertaining to the instrument used to create the data.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.ObsDataset">experiment.ObsDataset</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Abstract object extending Dataset with metadata relevant to datasets derived from Observations.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.ObsDataset.calibLevel">experiment.ObsDataset.calibLevel</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">High level classification for the calibration level of the particular dataset as a whole.  The calibration level concept conveys
-          to the user information on how much data reduction/processing has been applied to the data.  It is up to the data providers
-          to consider how to map their own internal classification to the scale defined here.
-          Scale:
-          * 0 - Raw instrumental data, in a proprietary or internal data-provider defined format.
-          * 1 - Instrumental data in a standard format (FITS, VOTable, etc )
-          * 2 - Calibrated, science ready data with the instrument signature removed.
-          * 3 - Enhanced data products like mosaics, resampled or drizzled images, or heavily processed survey fields.  Level 3 data
-          products may represent the combination of data from multiple primary observations.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.ObsDataset.characterisation">experiment.ObsDataset.characterisation</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">Characterisation provides a 'characteristic' view of the dataset coordinate space.  For each represented domain (spatial,
-          spectral, temporal, etc), characterisation provides metadata summarizing the coverage, resolution, representative accuracies,
-          etc. for the dataset asa a whole.
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.ObsDataset.coordSys">experiment.ObsDataset.coordSys</a></td>
-        <td class="feature-detail">reference</td>
-        <td class="feature-detail">Zero or more references to coordinate system defintions associated with the dataset.  Since multiple data products may contibute
-          to the content of a dataset, this element provides convenient, high-level access to definitions which may be distributed among
-          lower-level objects.  
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.ObsDataset.derived">experiment.ObsDataset.derived</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">Provides a high level summary of certain properties of the dataset.  Its primary purpose is to support high level filtering
-          of datasets during data discovery.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.ObsDataset.obsConfig">experiment.ObsDataset.obsConfig</a></td>
-        <td class="feature-detail">reference</td>
-        <td class="feature-detail">Reference to ObsConfig object from Observation.  This object provides some high-level metadata related to the observation
-          configuration.
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.ObsDataset.proposal">experiment.ObsDataset.proposal</a></td>
-        <td class="feature-detail">reference</td>
-        <td class="feature-detail">Reference to Proposal object from Observation.  This object provides metadata identifying any proposal related to the observation
-          which produced the dataset.
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.ObsDataset.target">experiment.ObsDataset.target</a></td>
-        <td class="feature-detail">reference</td>
-        <td class="feature-detail">Reference to a BaseTarget object from Observation.  Provides metadata describing the target of the observation.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.Observation">experiment.Observation</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Head class for an Observation Experiment.
-          The Observation is modeled as a type of 'Experiment', with some basic structure defined to provide metadata about the observation
-          target and configuration.  The product, or 'result' of the Observation is zero or more ObsDataset objects.  This pattern is
-          inspired by, and compatible with the Simulation Data Model, where a 'Simulation' can be considered another form of 'Experiment'
-          or perhaps even another form of 'Observation'.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.Observation.obsConfig">experiment.Observation.obsConfig</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">Observation configuration metadata, provides information about who, where, and how the observation was conducted.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.Observation.observationID">experiment.Observation.observationID</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Internal ID determined by the data provide to uniquely identify the observation within the institution or entity performing
-          the observation.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.Observation.proposal">experiment.Observation.proposal</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">Identifies any proposal related to the observation.  This field may be used to gather all observations and products related
-          to a particular proposal.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.Observation.result">experiment.Observation.result</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">The result of an observation is zero or more Observation Datasets.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.Observation.target">experiment.Observation.target</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">The target of the observation.  The content of this object may vary greatly depending on the goals and nature of the observation.
-          For example, the 'target' could be a galaxy, stellar object, planet, or calibratioin source.  As such, we allow the BaseTarget
-          class here, and permit the users to define and use more content rich flavors according to their needs.
-        </td>
-      </tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">0..1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="provenance.WasGeneratedByDescription"></a>2.3.18 objectType: WasGeneratedByDescription
+    </h3>
+    <div align="center">
+      <table border="1" width="100%" cellspacing="2">
+        <tr>
+          <td class="objecttype-title" width="20%">vodml-id</td>
+          <td class="objecttype-name" colspan="1">provenance.WasGeneratedByDescription</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">
+            <table width="100%" cellpadding="0" cellspacing="0" border="0">
+              <tr>
+                <td colspan="2" bgcolor="#cacaca">
+                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
+                    <tr>
+                      <td width="20%" class="info-title">package</td>
+                      <td colspan="3" class="feature-detail"><a href="#provenance">provenance</a></td>
+                    </tr>
+                    <tr>
+                      <td class="info-title">referrers</td>
+                      <td class="feature-detail" colspan="3"><a href="#provenance.WasGeneratedBy">WasGeneratedBy</a> 
+                      </td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="provenance.WasGeneratedByDescription.role"></a><b>role</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#string">string [provenance:string]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">provenance.WasGeneratedByDescription.role</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><hr>
+    <h1>3.<a name="vodml-ids">Element Identifiers/VO-DMLrefs</a></h1>  
+    The following table shows all fully qualified vodml-ids for this data model.
+    It is ordered alphabetically and the identifiers are hyper-linked to the location
+    in the document where the actual element is fully defined.
+    
+    
+    <table style="border-style:solid;border-width:1px;" border="1" cellspacing="0" cellpadding="0">
       <tr>
-        <td class="feature-detail"><a href="#experiment.Proposal">experiment.Proposal</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Metadata related to the proposal or document which spawned the observation.
-          
-        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-heading">feature type</td>
+        <td class="feature-heading">description</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#experiment.Proposal.identifier">experiment.Proposal.identifier</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Tag used to uniquely identify a particular proposal within the institution or entity.
+        <td class="feature-detail"><a href="#"></a></td>
+        <td class="feature-detail">vo-dml:model</td>
+        <td class="feature-detail">This document provides a data model describing the structure and content of generic Dataset metadata for the IVOA.  This is
+          a high-level model which is to be referenced and extended by other models describing specific types of Datasets and Data products.
+          In this document, we specify the generic Dataset, as well as an ObservationDataset model which covers the class of Datasets
+          which are derived from an Observation.  At the time of this writing, there is no formal Observation-Experiment model for the
+          IVOA, so we include a hypothetical Observation-Experiment model to serve as a placeholder. 
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#experiment.Target">experiment.Target</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">General purpose Target object.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#experiment.Target.objectClass">experiment.Target.objectClass</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">General classification or type of the target.  This field supports the discovery of data pertaining to a common class.  e.g.
-          "Star", "Galaxy", "AGN".  At the time of this writing, there is no IVOA recommended vocabulary for this field.  The SIMBAD
-          and NED databases use defined vocabularies for astronomical object classifications which may serve as the basis for such.
-        </td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#ivoa">ivoa</a></td>
         <td class="feature-detail">package</td>
         <td class="feature-detail">Base Data Types V1.0 (2014)</td>
@@ -7393,88 +3094,9 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#party">party</a></td>
-        <td class="feature-detail">package</td>
-        <td class="feature-detail">We include a simple Party model for associating an Entity with a Role that Entity is playing.  For example, a particular Individual
-          can be both a Contact and Publisher of a dataset.
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#party.Individual">party.Individual</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Abstract head of the sub-set of Parties which describe a single individual.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#party.Individual.address">party.Individual.address</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Mailing address for the person.  The value is expressed as a single string containing all components of the address. </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#party.Individual.email">party.Individual.email</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">E-mail address of the Individual</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#party.Individual.phone">party.Individual.phone</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Phone number associated with the person.  The value is expressed as a string according to the format appropriate for the locale.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#party.Organization">party.Organization</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Extension of Party for any Organization or Institution.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#party.Organization.address">party.Organization.address</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Mailing address.  The value is expressed as a single string containing all components of the address. 
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#party.Organization.email">party.Organization.email</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">E-mail address of the Organization.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#party.Organization.logo">party.Organization.logo</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">URL pointer to a graphical logo associated with the Organization.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#party.Organization.phone">party.Organization.phone</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Phone number.  The value is expressed as a string according to the format appropriate for the locale.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#party.Party">party.Party</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Abstract head of the set of classes describing various entities. </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#party.Party.name">party.Party.name</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">Name of the Party or entity.  All entities are assumed to have a name.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#party.Role">party.Role</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">Abstract class for the entity role.  Models should extend this class to define local roles which are played by various entities/parties.</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#party.Role.party">party.Role.party</a></td>
-        <td class="feature-detail">reference</td>
-        <td class="feature-detail">Reference to the Party or Entity which is associated with this role.</td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#provenance">provenance</a></td>
         <td class="feature-detail">package</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">This document provides a data model for describing provenance.</td>
       </tr>
       <tr>
         <td class="feature-detail"><a href="#provenance.Activity">provenance.Activity</a></td>
@@ -7519,18 +3141,12 @@
       <tr>
         <td class="feature-detail"><a href="#provenance.Activity.id">provenance.Activity.id</a></td>
         <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail"><Enter note text here></td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#provenance.Activity.label">provenance.Activity.label</a></td>
+        <td class="feature-detail"><a href="#provenance.Activity.name">provenance.Activity.name</a></td>
         <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail"><Enter note text here></td>
       </tr>
       <tr>
         <td class="feature-detail"><a href="#provenance.Activity.parameter">provenance.Activity.parameter</a></td>
@@ -7589,7 +3205,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#provenance.ActivityDescription.docuLink">provenance.ActivityDescription.docuLink</a></td>
+        <td class="feature-detail"><a href="#provenance.ActivityDescription.doculink">provenance.ActivityDescription.doculink</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -7605,12 +3221,9 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#provenance.ActivityDescription.label">provenance.ActivityDescription.label</a></td>
+        <td class="feature-detail"><a href="#provenance.ActivityDescription.name">provenance.ActivityDescription.name</a></td>
         <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail"><Enter note text here></td>
       </tr>
       <tr>
         <td class="feature-detail"><a href="#provenance.ActivityDescription.parameterDescription">provenance.ActivityDescription.parameterDescription</a></td>
@@ -7693,14 +3306,6 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#provenance.Agent.party">provenance.Agent.party</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#provenance.Agent.wasAssociatedWith">provenance.Agent.wasAssociatedWith</a></td>
         <td class="feature-detail">collection</td>
         <td class="feature-detail">
@@ -7813,14 +3418,6 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#provenance.Entity.access">provenance.Entity.access</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
         <td class="feature-detail"><a href="#provenance.Entity.annotation">provenance.Entity.annotation</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
@@ -7845,7 +3442,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#provenance.Entity.label">provenance.Entity.label</a></td>
+        <td class="feature-detail"><a href="#provenance.Entity.name">provenance.Entity.name</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -7861,6 +3458,11 @@
         </td>
       </tr>
       <tr>
+        <td class="feature-detail"><a href="#provenance.Entity.rights">provenance.Entity.rights</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><Enter note text here></td>
+      </tr>
+      <tr>
         <td class="feature-detail"><a href="#provenance.Entity.type">provenance.Entity.type</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
@@ -7909,15 +3511,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#provenance.EntityDescription.dataproduct_subtype">provenance.EntityDescription.dataproduct_subtype</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#provenance.EntityDescription.dataproduct_type">provenance.EntityDescription.dataproduct_type</a></td>
+        <td class="feature-detail"><a href="#provenance.EntityDescription.category">provenance.EntityDescription.category</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -7925,15 +3519,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#provenance.EntityDescription.dataset">provenance.EntityDescription.dataset</a></td>
-        <td class="feature-detail">collection</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#provenance.EntityDescription.docu_link">provenance.EntityDescription.docu_link</a></td>
+        <td class="feature-detail"><a href="#provenance.EntityDescription.doculink">provenance.EntityDescription.doculink</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -7949,15 +3535,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#provenance.EntityDescription.label">provenance.EntityDescription.label</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#provenance.EntityDescription.level">provenance.EntityDescription.level</a></td>
+        <td class="feature-detail"><a href="#provenance.EntityDescription.name">provenance.EntityDescription.name</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -8006,7 +3584,7 @@
       </tr>
       <tr>
         <td class="feature-detail"><a href="#provenance.HadStep.activity">provenance.HadStep.activity</a></td>
-        <td class="feature-detail">collection</td>
+        <td class="feature-detail">reference</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
@@ -8074,7 +3652,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#provenance.ParameterDescription.label">provenance.ParameterDescription.label</a></td>
+        <td class="feature-detail"><a href="#provenance.ParameterDescription.name">provenance.ParameterDescription.name</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -8114,6 +3692,14 @@
         </td>
       </tr>
       <tr>
+        <td class="feature-detail"><a href="#provenance.Used.role">provenance.Used.role</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
         <td class="feature-detail"><a href="#provenance.Used.usedDescription">provenance.Used.usedDescription</a></td>
         <td class="feature-detail">reference</td>
         <td class="feature-detail">
@@ -8178,36 +3764,23 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#provenance.WasGeneratedBy.wasGeneratedByDescription">provenance.WasGeneratedBy.wasGeneratedByDescription</a></td>
-        <td class="feature-detail">reference</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#provenance.WasGeneratedByDescription">provenance.WasGeneratedByDescription</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#provenance.WasGeneratedBy.role">provenance.WasGeneratedBy.role</a></td>
+        <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#provenance.WasGeneratedByDescription.role">provenance.WasGeneratedByDescription.role</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#provenance.WasGeneratedBy.wasGeneratedByDescription">provenance.WasGeneratedBy.wasGeneratedByDescription</a></td>
+        <td class="feature-detail">reference</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#stc">stc</a></td>
-        <td class="feature-detail">package</td>
-        <td class="feature-detail">Space-Time Coordinates (STC) Model protoype V2.0</td>
-      </tr>
-      <tr>
-        <td class="feature-detail"><a href="#stc.AstroCoordSystem">stc.AstroCoordSystem</a></td>
+        <td class="feature-detail"><a href="#provenance.WasGeneratedByDescription">provenance.WasGeneratedByDescription</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -8215,35 +3788,13 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#stc.Position">stc.Position</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#provenance.WasGeneratedByDescription.role">provenance.WasGeneratedByDescription.role</a></td>
+        <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
     </table>
-    <hr>
-    <h1>4.<a name="modelimports">Imported Models</a></h1>
-    <p>This section lists the external models imported by the current data model.
-      For each imported model we list URLs to the VO-DML and HTML representations and the prefix used for vodml-ids from inside
-      the model.
-    </p>
-    <h2><a name="ds"></a>4.1 ds
-    </h2>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">Model vodml-id</td>
-        <td class="objecttype-name">ds</td>
-      </tr>
-      <tr>
-        <td width="30%" class="info-title">url</td>
-        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/datasetModel_uml2p4p1.xmi">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/datasetModel_uml2p4p1.xmi</a></td>
-      </tr>
-      <tr>
-        <td width="30%" class="info-title">documentation url</td>
-        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/</a></td>
-      </tr>
-    </table>
   </body>
 </html>
\ No newline at end of file

Modified: trunk/projects/dm/vo-dml/models/provenancedm/ProvenanceDM.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml
==============================================================================
--- trunk/projects/dm/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml	Fri May  5 13:55:33 2017	(r4015)
+++ trunk/projects/dm/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml	Fri May  5 15:01:21 2017	(r4016)
@@ -7,12 +7,7 @@
 </description>
   <title/>
   <version>0.x</version>
-  <lastModified>2016-12-16T13:06:24</lastModified>
-  <import>
-    <name>ds</name>
-    <url>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/datasetModel_uml2p4p1.xmi</url>
-    <documentationURL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/</documentationURL>
-  </import>
+  <lastModified>2017-05-05T14:57:41</lastModified>
 
   <package>
     <vodml-id>ivoa</vodml-id>
@@ -178,1232 +173,9 @@
 
 
   <package>
-    <vodml-id>char</vodml-id>
-    <name>char</name>
-    <description>Characterisation Model V1.13 (2008)</description>
-    <objectType>
-      <vodml-id>char.Char</vodml-id>
-      <name>Char</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-    </objectType>
-
-  </package>
-
-
-
-  <package>
-    <vodml-id>stc</vodml-id>
-    <name>stc</name>
-    <description>Space-Time Coordinates (STC) Model protoype V2.0</description>
-    <dataType>
-      <vodml-id>stc.Position</vodml-id>
-      <name>Position</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-    </dataType>
-
-    <objectType>
-      <vodml-id>stc.AstroCoordSystem</vodml-id>
-      <name>AstroCoordSystem</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-    </objectType>
-
-  </package>
-
-
-
-  <package>
-    <vodml-id>experiment</vodml-id>
-    <name>experiment</name>
-    <description>The Observation Experiment model refers to several elements related to an Observation and its configuration.  As of the time of this writing, there is no IVOA recommendation for a general Observation data model.  The Provenance data model, in progress, will define the pattern for describing the relation between actions and results, and how to record these in datasets.  In lieu of these standards, this document defines a straw-man Observation model.  
-</description>
-    <objectType>
-      <vodml-id>experiment.Observation</vodml-id>
-      <name>Observation</name>
-      <description>Head class for an Observation Experiment.
-The Observation is modeled as a type of 'Experiment', with some basic structure defined to provide metadata about the observation target and configuration.  The product, or 'result' of the Observation is zero or more ObsDataset objects.  This pattern is inspired by, and compatible with the Simulation Data Model, where a 'Simulation' can be considered another form of 'Experiment' or perhaps even another form of 'Observation'.
-</description>
-      <attribute>
-        <vodml-id>experiment.Observation.observationID</vodml-id>
-        <name>observationID</name>
-        <description>Internal ID determined by the data provide to uniquely identify the observation within the institution or entity performing the observation.
-</description>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <collection>
-        <vodml-id>experiment.Observation.obsConfig</vodml-id>
-        <name>obsConfig</name>
-        <description>Observation configuration metadata, provides information about who, where, and how the observation was conducted.
-</description>
-        <datatype>
-          <vodml-ref>provenance:experiment.ObsConfig</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </collection>
-      <collection>
-        <vodml-id>experiment.Observation.result</vodml-id>
-        <name>result</name>
-        <description>The result of an observation is zero or more Observation Datasets.
-</description>
-        <datatype>
-          <vodml-ref>provenance:experiment.ObsDataset</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>-1</maxOccurs>
-        </multiplicity>
-      </collection>
-      <collection>
-        <vodml-id>experiment.Observation.target</vodml-id>
-        <name>target</name>
-        <description>The target of the observation.  The content of this object may vary greatly depending on the goals and nature of the observation.  For example, the 'target' could be a galaxy, stellar object, planet, or calibratioin source.  As such, we allow the BaseTarget class here, and permit the users to define and use more content rich flavors according to their needs.</description>
-        <datatype>
-          <vodml-ref>provenance:experiment.BaseTarget</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </collection>
-      <collection>
-        <vodml-id>experiment.Observation.proposal</vodml-id>
-        <name>proposal</name>
-        <description>Identifies any proposal related to the observation.  This field may be used to gather all observations and products related to a particular proposal.
-</description>
-        <datatype>
-          <vodml-ref>provenance:experiment.Proposal</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </collection>
-    </objectType>
-
-    <objectType>
-      <vodml-id>experiment.ObsConfig</vodml-id>
-      <name>ObsConfig</name>
-      <description>ObsConfig describes all Observation Configuration metadata.  We define a small set of configuration elements which are required as Provenance in the observation dataset.
-</description>
-      <attribute>
-        <vodml-id>experiment.ObsConfig.bandpass</vodml-id>
-        <name>bandpass</name>
-        <description>Describes the spectral domain of the observation in a very general sense.  
-  The value may be expressed in terms of general spectral bands, or specific bandpass names.  If multiple bands are covered, the value may be a comma delimited combination of appropriate bands.  If expressed as general bands, the value(s) must be selected from the enumerated set given by the SpectralBand type.  There is no controlled vocabulary for specific bandpass names as the list is too long to enumerate.  Effort should be made to use highly recognized bandpass names (eg: "U","V","B","R","I", "H-alpha").
-  This field corresponds to both the Coverage.Spectral and Coverage.Spectral.Bandpass fields of the Resource Metadata document.
-</description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>experiment.ObsConfig.datasource</vodml-id>
-        <name>datasource</name>
-        <description>Describes the original source of the data in a very general fashion.  In other words, "What sort of observation originally generated the data?"  Suggested values include:
-  + survey: Survey data typically covers some region of observational parameter space with as complete as possible coverage within that region.
-  + pointed:  Pointed data of a particular object or field.
-  + theory:  Theory data, generated based on a theoretical model.
-  + artificial:  Artificial, or simulated data.  Similar to 'theory', but not necessarily based on a theoretical model.
-  + custom:  Custom data, as part of a specific research project.
-</description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <collection>
-        <vodml-id>experiment.ObsConfig.facility</vodml-id>
-        <name>facility</name>
-        <description>Metadata pertaining to the facility performing the observation.
-</description>
-        <datatype>
-          <vodml-ref>provenance:experiment.Facility</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </collection>
-      <collection>
-        <vodml-id>experiment.ObsConfig.instrument</vodml-id>
-        <name>instrument</name>
-        <description>Metadata pertaining to the instrument used to create the data.</description>
-        <datatype>
-          <vodml-ref>provenance:experiment.Instrument</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </collection>
-    </objectType>
-
-    <objectType abstract="true">
-      <vodml-id>experiment.BaseTarget</vodml-id>
-      <name>BaseTarget</name>
-      <description>Abstract base class for the Target object tree.  The target object provides identifying metadata related to the subject or goal of the experiment.  For an Observational experiment, this would typically be an astronomical object.  The BaseTarget class defines high-level identifying information, and must be extended for particular classes of Target which may define additional  characteristics.
-</description>
-      <attribute>
-        <vodml-id>experiment.BaseTarget.name</vodml-id>
-        <name>name</name>
-        <description>The target name.  The primary purpose of this field is to provide the user with a recognizable identity of the particular subject or goal.  However, since this may be a query-able field in data discovery protocols, care should be taken to use values which follow conventions for the domain appropriate for the data.  For an astronomical object, this may be a name suitable for use within a domain-specific resolution service.  Simulated data might also use this sort of name (if simulating a particular object), or a more generic term such as "G2V star". 
-</description>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>experiment.BaseTarget.description</vodml-id>
-        <name>description</name>
-        <description>Free form description of target.
-</description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>experiment.BaseTarget.position</vodml-id>
-        <name>position</name>
-        <description>This field provides the spatial location of the target.  The value is an STC Position object which supports all required dimensionality and coordinate frame specification needs.
- </description>
-        <datatype>
-          <vodml-ref>provenance:stc.Position</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </objectType>
-
-    <objectType>
-      <vodml-id>experiment.Target</vodml-id>
-      <name>Target</name>
-      <description>General purpose Target object.</description>
-      <extends>
-        <vodml-ref>provenance:experiment.BaseTarget</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>experiment.Target.objectClass</vodml-id>
-        <name>objectClass</name>
-        <description>General classification or type of the target.  This field supports the discovery of data pertaining to a common class.  e.g. "Star", "Galaxy", "AGN".  At the time of this writing, there is no IVOA recommended vocabulary for this field.  The SIMBAD and NED databases use defined vocabularies for astronomical object classifications which may serve as the basis for such.</description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </objectType>
-
-    <objectType>
-      <vodml-id>experiment.AstroTarget</vodml-id>
-      <name>AstroTarget</name>
-      <description>Extension of BaseTarget specialized for astronomical objects.  The AstroTarget defines additional astronomical properties of the target.</description>
-      <extends>
-        <vodml-ref>provenance:experiment.BaseTarget</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>experiment.AstroTarget.objectClass</vodml-id>
-        <name>objectClass</name>
-        <description>General classification or type of the target.  This field supports the discovery of data pertaining to a common class.  e.g. "Star", "Galaxy", "AGN".  At the time of this writing, there is no IVOA recommended vocabulary for this field.  The SIMBAD and NED databases use defined vocabularies for astronomical object classifications which may serve as the basis for such.
-</description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>experiment.AstroTarget.spectralClass</vodml-id>
-        <name>spectralClass</name>
-        <description>Spectral class of the object.  As with objectClass, there is no IVOA recommended vocabulary for specifying the spectral class of an object.  There is an IVOA Note on the subject entitled "An encoding system to represent stellar spectral classes in archival databases and catalogs", describing an encoding system which has been adopted by the MAST archive.
-</description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>experiment.AstroTarget.redshift</vodml-id>
-        <name>redshift</name>
-        <description>This field gives the canonical redshift of the astronomical object.  It is normally used to store the cosmological redshift of extragalactic objects, although it may also be used to store the observed redshift of Galactic sources if that information is felt by the data provider to be useful.
-</description>
-        <datatype>
-          <vodml-ref>provenance:ivoa.real</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>experiment.AstroTarget.varAmpl</vodml-id>
-        <name>varAmpl</name>
-        <description>Canonical variability amplitude attributed to the target.
-</description>
-        <datatype>
-          <vodml-ref>provenance:ivoa.real</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </objectType>
-
-    <objectType>
-      <vodml-id>experiment.Facility</vodml-id>
-      <name>Facility</name>
-      <description>Facility performing the observation.
-</description>
-      <extends>
-        <vodml-ref>provenance:party.Role</vodml-ref>
-      </extends>
-      <reference>
-        <vodml-id>experiment.Facility.party</vodml-id>
-        <name>party</name>
-        <description>Reference to the Party or Entity which is associated with this role.</description>
-        <datatype>
-          <vodml-ref>provenance:party.Organization</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </reference>
-    </objectType>
-
-    <objectType>
-      <vodml-id>experiment.Instrument</vodml-id>
-      <name>Instrument</name>
-      <description>Identifies the instrument used to create the data.  This can be a specific instrument name, general type or something else, such as a program in the case of theoretical data.   (RM:Collection.Instrument) </description>
-      <attribute>
-        <vodml-id>experiment.Instrument.name</vodml-id>
-        <name>name</name>
-        <description>Name of the instrument.
-</description>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </objectType>
-
-    <objectType>
-      <vodml-id>experiment.Proposal</vodml-id>
-      <name>Proposal</name>
-      <description>Metadata related to the proposal or document which spawned the observation.
-</description>
-      <attribute>
-        <vodml-id>experiment.Proposal.identifier</vodml-id>
-        <name>identifier</name>
-        <description>Tag used to uniquely identify a particular proposal within the institution or entity.
-</description>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </objectType>
-
-    <objectType>
-      <vodml-id>experiment.Characterisation</vodml-id>
-      <name>Characterisation</name>
-      <description>This Characterisation object is a direct extension of the Characterisation object from the IVOA Characterisation Data Model Standard.  This provides a local object which may be contained in a 'composition' relation to other objects of this model (specifically ObsDataset).  This object may be extended and/or modified by specific Dataset models as needed.
-	Characterisation provides a broad scale description of the coordinate space occupied by the dataset in each of the axis domains.  This includes axes not directly represented in the dataset 'data', for example, the Time axis of a 2D special image.  As such, there is a strong correlation between Characterisation and Data objects.  In some cases, the values may be directly derived from the Data, in others, they provide supporting metadata about the broader domain.  For example, the Accuracy fields in Characterisation represent typical accuracy for the dataset, while those within Data provide per-data-point errors.   </description>
-      <extends>
-        <vodml-ref>provenance:char.Char</vodml-ref>
-      </extends>
-    </objectType>
-
-    <objectType>
-      <vodml-id>experiment.Derived</vodml-id>
-      <name>Derived</name>
-      <description>The Derived (short for Derived Data) object holds derived information obtained by evaluating or analyzing the contents of the dataset.  The specific content of this object is strongly dependent on the specific type of dataset, so we provide a generic model which may be specialized in other models to define elements appropriate for that type of dataset.
-
-The primary purpose of this object is to provide a common framework in which specific information may be placed to aid in discovery and filtering of datasets in various access protocols.
- </description>
-      <collection>
-        <vodml-id>experiment.Derived.derivedElement</vodml-id>
-        <name>derivedElement</name>
-        <description>Collection of zero or more DerivedElement objects, each of which provides a specific quantity obtained by analyzing the dataset content.
-</description>
-        <datatype>
-          <vodml-ref>provenance:experiment.DerivedElement</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>-1</maxOccurs>
-        </multiplicity>
-      </collection>
-    </objectType>
-
-    <objectType abstract="true">
-      <vodml-id>experiment.ObsDataset</vodml-id>
-      <name>ObsDataset</name>
-      <description>Abstract object extending Dataset with metadata relevant to datasets derived from Observations.
-</description>
-      <extends>
-        <vodml-ref>provenance:dataset.Dataset</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>experiment.ObsDataset.calibLevel</vodml-id>
-        <name>calibLevel</name>
-        <description>High level classification for the calibration level of the particular dataset as a whole.  The calibration level concept conveys to the user information on how much data reduction/processing has been applied to the data.  It is up to the data providers to consider how to map their own internal classification to the scale defined here.
-Scale:
-* 0 - Raw instrumental data, in a proprietary or internal data-provider defined format.
-* 1 - Instrumental data in a standard format (FITS, VOTable, etc )
-* 2 - Calibrated, science ready data with the instrument signature removed.
-* 3 - Enhanced data products like mosaics, resampled or drizzled images, or heavily processed survey fields.  Level 3 data products may represent the combination of data from multiple primary observations.
-</description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <collection>
-        <vodml-id>experiment.ObsDataset.characterisation</vodml-id>
-        <name>characterisation</name>
-        <description>Characterisation provides a 'characteristic' view of the dataset coordinate space.  For each represented domain (spatial, spectral, temporal, etc), characterisation provides metadata summarizing the coverage, resolution, representative accuracies, etc. for the dataset asa a whole.</description>
-        <datatype>
-          <vodml-ref>provenance:experiment.Characterisation</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </collection>
-      <collection>
-        <vodml-id>experiment.ObsDataset.derived</vodml-id>
-        <name>derived</name>
-        <description>Provides a high level summary of certain properties of the dataset.  Its primary purpose is to support high level filtering of datasets during data discovery.
-</description>
-        <datatype>
-          <vodml-ref>provenance:experiment.Derived</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </collection>
-      <reference>
-        <vodml-id>experiment.ObsDataset.coordSys</vodml-id>
-        <name>coordSys</name>
-        <description>Zero or more references to coordinate system defintions associated with the dataset.  Since multiple data products may contibute to the content of a dataset, this element provides convenient, high-level access to definitions which may be distributed among lower-level objects.  
-</description>
-        <datatype>
-          <vodml-ref>provenance:stc.AstroCoordSystem</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>-1</maxOccurs>
-        </multiplicity>
-      </reference>
-      <reference>
-        <vodml-id>experiment.ObsDataset.target</vodml-id>
-        <name>target</name>
-        <description>Reference to a BaseTarget object from Observation.  Provides metadata describing the target of the observation.</description>
-        <datatype>
-          <vodml-ref>provenance:experiment.BaseTarget</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </reference>
-      <reference>
-        <vodml-id>experiment.ObsDataset.proposal</vodml-id>
-        <name>proposal</name>
-        <description>Reference to Proposal object from Observation.  This object provides metadata identifying any proposal related to the observation which produced the dataset.</description>
-        <datatype>
-          <vodml-ref>provenance:experiment.Proposal</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </reference>
-      <reference>
-        <vodml-id>experiment.ObsDataset.obsConfig</vodml-id>
-        <name>obsConfig</name>
-        <description>Reference to ObsConfig object from Observation.  This object provides some high-level metadata related to the observation configuration.</description>
-        <datatype>
-          <vodml-ref>provenance:experiment.ObsConfig</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </reference>
-    </objectType>
-
-    <objectType abstract="true">
-      <vodml-id>experiment.DerivedElement</vodml-id>
-      <name>DerivedElement</name>
-      <description>Abstract base for defining derived data elements.  Typically, models for specific data products would extend this object to define various elements appropriate for that model.  For example, the Spectrum model could define signal-to-noise ratio (SNR), or TimeSeries could define period, or variability.  We put no restriction on the DerivedElement content since the result could be a simple value or a complex object.  However, it is recommended that extensions be simple and compact in keeping with the primary intent of use in data discovery.
-</description>
-    </objectType>
-
-    <objectType>
-      <vodml-id>experiment.DerivedScalar</vodml-id>
-      <name>DerivedScalar</name>
-      <description>Simple extension of DerivedElement class which can serve many use cases.  Usages of this object in other models to define specific elements should explicitly define the element name, and the process by which the value is determined.
-</description>
-      <extends>
-        <vodml-ref>provenance:experiment.DerivedElement</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>experiment.DerivedScalar.name</vodml-id>
-        <name>name</name>
-        <description>Name identifying the derived element.</description>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>experiment.DerivedScalar.value</vodml-id>
-        <name>value</name>
-        <description>Value of the derived element.
-</description>
-        <datatype>
-          <vodml-ref>provenance:ivoa.Quantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </objectType>
-
-  </package>
-
-
-
-  <package>
-    <vodml-id>dataset</vodml-id>
-    <name>dataset</name>
-    <description>Dataset Metadata package</description>
-    <enumeration>
-      <vodml-id>dataset.DataProductType</vodml-id>
-      <name>DataProductType</name>
-      <description>Enumeration identifying the high level classification of a data product.</description>
-      <literal>
-        <vodml-id>dataset.DataProductType.CUBE</vodml-id>
-        <name>CUBE</name>
-        <description>A multidimensional astronomical image of three (3) or more axes.
-</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.DataProductType.IMAGE</vodml-id>
-        <name>IMAGE</name>
-        <description>A two (2) dimensional astronomical image.</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.DataProductType.PHOTOMETRY</vodml-id>
-        <name>PHOTOMETRY</name>
-        <description>Dataset with spectral coverage with irregular gaps.
-</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.DataProductType.SPECTRUM</vodml-id>
-        <name>SPECTRUM</name>
-        <description>Dataset where spectral coverage is the primary attribute, in contiguous bins. e.g. a 1D spectrum or a long slit spectrum.
-</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.DataProductType.TIMESERIES</vodml-id>
-        <name>TIMESERIES</name>
-        <description>Dataset presenting some quantity varying as a function of time.  A light curve is a typical example of a timeseries dataset.</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.DataProductType.SED</vodml-id>
-        <name>SED</name>
-        <description>A spectral energy distribution, an advanced data product often produced by combining data from multiple observations.</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.DataProductType.VISIBILITY</vodml-id>
-        <name>VISIBILITY</name>
-        <description>A visibility (radio) dataset. Typically this is instrumental data, and is often a complex object containing multiple files or other substructures.  A visibility dataset may contain data with spatial, spectral, time, and polarization information for each measured visibility.</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.DataProductType.EVENT</vodml-id>
-        <name>EVENT</name>
-        <description>An event counting dataset (e.g. X-ray). An event dataset may contain data with spatial, spectral, and time information for each measured event. </description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.DataProductType.CATALOG</vodml-id>
-        <name>CATALOG</name>
-        <description>A catalog.
-</description>
-      </literal>
-    </enumeration>
-
-    <enumeration>
-      <vodml-id>dataset.CreationType</vodml-id>
-      <name>CreationType</name>
-      <description>Enumeration of dataset creation types.</description>
-      <literal>
-        <vodml-id>dataset.CreationType.ARCHIVAL</vodml-id>
-        <name>ARCHIVAL</name>
-        <description>Indicates that it is one of a collection of datasets generated in a systematic, homogeneous way and is stored statically (or at least versioned).  It will be possible to regenerate this dataset at a later date.  The remaining types imply on-the-fly manipulation.</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.CreationType.CUTOUT</vodml-id>
-        <name>CUTOUT</name>
-        <description>Indicates that the dataset was created "on-the-fly", by subsetting, but not by modifying values.
-</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.CreationType.FILTERED</vodml-id>
-        <name>FILTERED</name>
-        <description>May involve excluding data prior to binning into samples, also "on-the-fly"
-</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.CreationType.MOSAIC</vodml-id>
-        <name>MOSAIC</name>
-        <description>Combines multiple original datasets "on-the-fly"</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.CreationType.SPECTRAL_EXTRACTION</vodml-id>
-        <name>SPECTRAL_EXTRACTION</name>
-        <description>Has been extracted, for example, from a spectral data cube.
-</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.CreationType.CATALOG_EXTRACTION</vodml-id>
-        <name>CATALOG_EXTRACTION</name>
-        <description>Has been extracted from a catalog.</description>
-      </literal>
-    </enumeration>
-
-    <enumeration>
-      <vodml-id>dataset.RightsType</vodml-id>
-      <name>RightsType</name>
-      <description>Enumeration of access rights levels.
-</description>
-      <literal>
-        <vodml-id>dataset.RightsType.PUBLIC</vodml-id>
-        <name>PUBLIC</name>
-        <description>unrestricted, public access is allowed, without authentication.</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.RightsType.PROPRIETARY</vodml-id>
-        <name>PROPRIETARY</name>
-        <description>only proprietary access is allowed with authentication. 
-</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.RightsType.SECURE</vodml-id>
-        <name>SECURE</name>
-        <description>authenticated, public access is allowed.</description>
-      </literal>
-    </enumeration>
-
-    <enumeration>
-      <vodml-id>dataset.SpectralBandType</vodml-id>
-      <name>SpectralBandType</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-      <literal>
-        <vodml-id>dataset.SpectralBandType.RADIO</vodml-id>
-        <name>RADIO</name>
-        <description>λ ≥ 10 mm; ν ≤ 30 GHz</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.SpectralBandType.MILLIMETER</vodml-id>
-        <name>MILLIMETER</name>
-        <description>0.1 mm ≤ λ ≤ 10 mm; 3000 GHz ≥ ν ≥ 30 GHz
-</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.SpectralBandType.INFRARED</vodml-id>
-        <name>INFRARED</name>
-        <description>1 μ ≤ λ ≤ 100 μ</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.SpectralBandType.OPTICAL</vodml-id>
-        <name>OPTICAL</name>
-        <description>0.3 μ ≤ λ ≤ 1 μ
-</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.SpectralBandType.ULTRAVIOLET</vodml-id>
-        <name>ULTRAVIOLET</name>
-        <description>100 Å ≤ λ ≤ 3000 Å; 1.2 eV ≤ E ≤ 120 eV
-</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.SpectralBandType.XRAY</vodml-id>
-        <name>XRAY</name>
-        <description>0.1 Å ≤ λ ≤ 100 Å; 0.12 keV ≤ E ≤ 120 keV
-</description>
-      </literal>
-      <literal>
-        <vodml-id>dataset.SpectralBandType.GAMMARAY</vodml-id>
-        <name>GAMMARAY</name>
-        <description>E ≥ 120keV</description>
-      </literal>
-    </enumeration>
-
-    <objectType>
-      <vodml-id>dataset.DataModel</vodml-id>
-      <name>DataModel</name>
-      <description>This object provides specific information regarding the data model and version thereof that a dataset represents.  This information is primarily an aide to (de)serialization of the dataset.  As such, it would better be defined by serialization conventions.  In lieu of such conventions, we include this object and representative serialization examples for the primary file formats VOTable and FITS.
-</description>
-      <attribute>
-        <vodml-id>dataset.DataModel.name</vodml-id>
-        <name>name</name>
-        <description>Formatted string providing the name and version of the model document.  The format speficication is "[name]-[version].[subversion]". Each derived model should specifically state the appropriate string for this field.
-</description>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dataset.DataModel.prefix</vodml-id>
-        <name>prefix</name>
-        <description>Prefix string used in UType string for elements associated with the model.  For IVOA standard models, this will be a predetermined string (e.g. 'stc' or 'spec').  Extended, or user defined content can specify a unique prefix for their own content.
-</description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dataset.DataModel.URL</vodml-id>
-        <name>URL</name>
-        <description>URL pointer to the XML schema associated with the model.
-</description>
-        <datatype>
-          <vodml-ref>provenance:ivoa.anyURI</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </objectType>
-
-    <objectType abstract="true">
-      <vodml-id>dataset.Dataset</vodml-id>
-      <name>Dataset</name>
-      <description>Abstract object for the generic IVOA Dataset.  It is intended to be useful for any type of data.  Specific dataset models should extend this object, providing detailed definitions and additional content as appropriate for that type of dataset.
-</description>
-      <attribute>
-        <vodml-id>dataset.Dataset.dataProductType</vodml-id>
-        <name>dataProductType</name>
-        <description>Describes the high level scientific classification of the data content.  Values are restricted to the DataProductType enumeration set and convey the general idea of the content and organization of
-a dataset.
-</description>
-        <datatype>
-          <vodml-ref>provenance:dataset.DataProductType</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dataset.Dataset.dataProductSubtype</vodml-id>
-        <name>dataProductSubtype</name>
-        <description>Secondary type classification for the dataset.  This field is intended to precisely specify the scientific nature of the data product, possibly in terms relevant only to a specific archive or data collection.  For example, dataProductType='image' could have associated dataProductSubtype="src.image", "bkg.image", "PixelMask", etc.  Values are unrestricted strings.
-</description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <collection>
-        <vodml-id>dataset.Dataset.curation</vodml-id>
-        <name>curation</name>
-        <description>Provides metadata related to the entity responsible for the curation of the dataset.
-</description>
-        <datatype>
-          <vodml-ref>provenance:dataset.Curation</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </collection>
-      <collection>
-        <vodml-id>dataset.Dataset.dataID</vodml-id>
-        <name>dataID</name>
-        <description>DataID provides high level identification metadata for the dataset itself, and any associations with various collections.</description>
-        <datatype>
-          <vodml-ref>provenance:dataset.DataID</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </collection>
-    </objectType>
-
-    <objectType>
-      <vodml-id>dataset.DataID</vodml-id>
-      <name>DataID</name>
-      <description>The Data Identification object (DataID) stores the dataset identifiers and other metadata typically assigned by the dataset creator.
-	The Dataset IDs in this object must comply with the syntax for dataset identifiers defined in the "IVOA Identifiers" document, including the use of 'stop' characters to identify specific datasets that are not individually in the registry.   e.g., ivo://example.net/aservice?2013/5/2342.
-	Much of the content of this object is assembled from various definitions in the IVAO Resource Metadata document.  Here, we provide a brief description of each field for easy reference, along with a notation of its mapping to the Resource Metadata document (RM:field), where the reader may find more detailed information.
-</description>
-      <attribute>
-        <vodml-id>dataset.DataID.title</vodml-id>
-        <name>title</name>
-        <description>A free form string giving a title for the dataset.  (RM:Identity.Title)</description>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dataset.DataID.datasetID</vodml-id>
-        <name>datasetID</name>
-        <description>If the dataset is registered with an external 'global index service' such as ADS, the publisher may include that identifier here.  This provides a common, persistent identifier for the dataset, and possible access point to follow for information on publications and other related datasets.  Note: the same dataset published at more than one location would have different Curation.publisherDID values, but the same DataID.datasetID.  eg: "ivo://ADS/Sa.CXO?obsid=1234", "ivo://ADS/sh.hut#ngc4151_141"
-</description>
-        <datatype>
-          <vodml-ref>provenance:ivoa.anyURI</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dataset.DataID.creatorDID</vodml-id>
-        <name>creatorDID</name>
-        <description>The dataset identifier assigned by the creator.  Here, the authority-id of the identifier must be that of the creator.  It is used to identify the original exposure of the dataset in an archive, and will remain static regardless of where the dataset is published.  The creator ID will not necessarily change even if the VO object in question is a cutout or is otherwise further processed.
-</description>
-        <datatype>
-          <vodml-ref>provenance:ivoa.anyURI</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dataset.DataID.version</vodml-id>
-        <name>version</name>
-        <description>Version assigned by the creator, reflecting the production version of the dataset.  This value should only be changed by the creator, upon the new release of a dataset.  There are no format restrictions or specifications on the versioning scheme.
-</description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dataset.DataID.date</vodml-id>
-        <name>date</name>
-        <description>Data processing or creation date (RM:Curation.Date).</description>
-        <datatype>
-          <vodml-ref>provenance:ivoa.datetime</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dataset.DataID.creationType</vodml-id>
-        <name>creationType</name>
-        <description>The dataset creation type describes the nature or genre of the content.  (RM:General.Type).
-Note: This field provides information about the process by which the dataset was created.  As the Observation/Experiment model matures, this may evolve into a provenance element on the Experiment type.</description>
-        <datatype>
-          <vodml-ref>provenance:dataset.CreationType</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <collection>
-        <vodml-id>dataset.DataID.creator</vodml-id>
-        <name>creator</name>
-        <description>The institution or entity which created the dataset.</description>
-        <datatype>
-          <vodml-ref>provenance:dataset.Creator</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </collection>
-      <collection>
-        <vodml-id>dataset.DataID.contributor</vodml-id>
-        <name>contributor</name>
-        <description>Persons or entities who contributed to the generation of the scientific content of the dataset.  Users of the dataset should include these in subsequent credits and acknowledgements. (RM:Curation.Contributor)</description>
-        <datatype>
-          <vodml-ref>provenance:dataset.Contributor</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>-1</maxOccurs>
-        </multiplicity>
-      </collection>
-      <collection>
-        <vodml-id>dataset.DataID.collection</vodml-id>
-        <name>collection</name>
-        <description>The dataset is associated with zero or more Collections (instrument name, survey name, etc.) .  Each instance identifies a tag indicating some degree of compatibility with other data sharing the same Collection properties.</description>
-        <datatype>
-          <vodml-ref>provenance:dataset.Collection</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>-1</maxOccurs>
-        </multiplicity>
-      </collection>
-    </objectType>
-
-    <objectType>
-      <vodml-id>dataset.Curation</vodml-id>
-      <name>Curation</name>
-      <description>The Curation object provides metadata assigned by the entity responsible for the support of the dataset content as well as identifying metadata about that entity.  It is assembled from definitions provided by the IVOA standard document, "Resource Metadata for the Virtual Observatory; Version 1.12"  (Resource Metadata).  Here, we provide a brief description of each field for easy reference, along with a notation of its mapping to the Resource Metadata document (RM:field), where the reader may find more detailed information.
-</description>
-      <attribute>
-        <vodml-id>dataset.Curation.publisherDID</vodml-id>
-        <name>publisherDID</name>
-        <description>IVOA dataset identifier assigned by the publisher to uniquely identify the dataset within its holdings.  Typically, the basis of this identifier will be the publisher ID.  However, if the publisherchooses to use a 'global index service' such as ADS to obtain persistent identifiers for their datasets, rather than generate their own, that identifier should be used both here and for DataID.datasetID.  Note: this model also defines a creator dataset ID (DataID.creatorDID), these will differ if the publishing entity is not the creator of the dataset.  Values are to be expressed as dataset identifiers using the syntax described in "IVOA Identifiers"</description>
-        <datatype>
-          <vodml-ref>provenance:ivoa.anyURI</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dataset.Curation.version</vodml-id>
-        <name>version</name>
-        <description>Version of the curated dataset, assigned by the publisher.  This is an independent versioning from DataID.version that allows the publisher to track changes to the high level dataset metadata (e.g. curation metadata, identifiers, etc.) without effecting the creator defined dataset version.  The value may be based on the DataID.version (e.g. by adding a sub-version extension), or an independent versioning.  There are no format restrictions on the value.  (RM:Curation.Version)
-</description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dataset.Curation.releaseDate</vodml-id>
-        <name>releaseDate</name>
-        <description>Date the curated dataset was last modified.  (RM:Curation.Date)</description>
-        <datatype>
-          <vodml-ref>provenance:ivoa.datetime</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dataset.Curation.rights</vodml-id>
-        <name>rights</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>provenance:dataset.RightsType</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <collection>
-        <vodml-id>dataset.Curation.publisher</vodml-id>
-        <name>publisher</name>
-        <description>The entity making the data available.  (RM:Curation.Publisher)</description>
-        <datatype>
-          <vodml-ref>provenance:dataset.Publisher</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </collection>
-      <collection>
-        <vodml-id>dataset.Curation.contact</vodml-id>
-        <name>contact</name>
-        <description>Contact information of the person/entity responsible for the content of the dataset.  We recommend using a generic 'helpdesk' type contact rather than individuals whose information may more easily become obsolete. (RM:Curation.Contact)</description>
-        <datatype>
-          <vodml-ref>provenance:dataset.Contact</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </collection>
-      <collection>
-        <vodml-id>dataset.Curation.reference</vodml-id>
-        <name>reference</name>
-        <description>Zero or more bibliographic or documentation references associated with the dataset.  Each instance provides a single forward link to a major publication which references the dataset.  (RM:General.Source)</description>
-        <datatype>
-          <vodml-ref>provenance:dataset.Publication</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>-1</maxOccurs>
-        </multiplicity>
-      </collection>
-    </objectType>
-
-    <objectType>
-      <vodml-id>dataset.Publisher</vodml-id>
-      <name>Publisher</name>
-      <description>Publisher is modeled as a Role played by the organization or entity making the Dataset available.</description>
-      <extends>
-        <vodml-ref>provenance:party.Role</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dataset.Publisher.publisherID</vodml-id>
-        <name>publisherID</name>
-        <description>IVOA resource identifier associated with the publisher and registered with an IVOA compliant registry  (eg: ivo://mast.stsci.edu).  Values are to be expressed using the syntax described in "IVOA Identifiers".
-</description>
-        <datatype>
-          <vodml-ref>provenance:ivoa.anyURI</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </objectType>
-
-    <objectType>
-      <vodml-id>dataset.Contact</vodml-id>
-      <name>Contact</name>
-      <description>Contact information for a person or entity.
-
-Contact is modeled as a Role played by a particular person or entity (Party).  We subset the type of Party to include only Individuals.  This includes both a physical person, or proxy service such as a helpdesk.
-</description>
-      <extends>
-        <vodml-ref>provenance:party.Role</vodml-ref>
-      </extends>
-      <reference>
-        <vodml-id>dataset.Contact.party</vodml-id>
-        <name>party</name>
-        <description>Reference to the Individual associated with this role.</description>
-        <datatype>
-          <vodml-ref>provenance:party.Individual</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </reference>
-    </objectType>
-
-    <objectType>
-      <vodml-id>dataset.Creator</vodml-id>
-      <name>Creator</name>
-      <description>Creator is modeled as a Role played by the organization or entity which created the Dataset.
-</description>
-      <extends>
-        <vodml-ref>provenance:party.Role</vodml-ref>
-      </extends>
-    </objectType>
-
-    <objectType>
-      <vodml-id>dataset.Contributor</vodml-id>
-      <name>Contributor</name>
-      <description>Contributor is modeled as a Role played by a Party or entity who participated in the generation of the Dataset.</description>
-      <extends>
-        <vodml-ref>provenance:party.Role</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dataset.Contributor.acknowledgment</vodml-id>
-        <name>acknowledgment</name>
-        <description>Acknowledgment expression for the contributor.  Users of the dataset should include these in subsequent credits and acknowledgements.  The expression should be formatted as desired by the contributor.</description>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </objectType>
-
-    <objectType>
-      <vodml-id>dataset.Publication</vodml-id>
-      <name>Publication</name>
-      <description>Any referenceable publication associated with a Dataset.</description>
-      <attribute>
-        <vodml-id>dataset.Publication.refCode</vodml-id>
-        <name>refCode</name>
-        <description>Reference code of the publication.  Values should be expressed as a URL, or bibcode (discernible as a 19 character string beginning with 4 digits).  Free text references are allowed, but discouraged.</description>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </objectType>
-
-    <objectType>
-      <vodml-id>dataset.Collection</vodml-id>
-      <name>Collection</name>
-      <description>A generic organizational construct which allows Datasets to be associated with each other by a set of Collection properties.  Datasets tagged with the same Collection properies can be assumed to have some degree of compatibility.</description>
-      <attribute>
-        <vodml-id>dataset.Collection.name</vodml-id>
-        <name>name</name>
-        <description>The values are generally defined by the creating entity.  Examples: "WFC", "Sloan", "BFS Spectrograph", "MSX Galactic Plane Survey".
-</description>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </objectType>
-
-  </package>
-
-
-
-  <package>
-    <vodml-id>party</vodml-id>
-    <name>party</name>
-    <description>We include a simple Party model for associating an Entity with a Role that Entity is playing.  For example, a particular Individual can be both a Contact and Publisher of a dataset.</description>
-    <objectType abstract="true">
-      <vodml-id>party.Party</vodml-id>
-      <name>Party</name>
-      <description>Abstract head of the set of classes describing various entities. </description>
-      <attribute>
-        <vodml-id>party.Party.name</vodml-id>
-        <name>name</name>
-        <description>Name of the Party or entity.  All entities are assumed to have a name.</description>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </objectType>
-
-    <objectType abstract="true">
-      <vodml-id>party.Role</vodml-id>
-      <name>Role</name>
-      <description>Abstract class for the entity role.  Models should extend this class to define local roles which are played by various entities/parties.</description>
-      <reference>
-        <vodml-id>party.Role.party</vodml-id>
-        <name>party</name>
-        <description>Reference to the Party or Entity which is associated with this role.</description>
-        <datatype>
-          <vodml-ref>provenance:party.Party</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </reference>
-    </objectType>
-
-    <objectType>
-      <vodml-id>party.Individual</vodml-id>
-      <name>Individual</name>
-      <description>Abstract head of the sub-set of Parties which describe a single individual.</description>
-      <extends>
-        <vodml-ref>provenance:party.Party</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>party.Individual.address</vodml-id>
-        <name>address</name>
-        <description>Mailing address for the person.  The value is expressed as a single string containing all components of the address. </description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>party.Individual.phone</vodml-id>
-        <name>phone</name>
-        <description>Phone number associated with the person.  The value is expressed as a string according to the format appropriate for the locale.</description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>party.Individual.email</vodml-id>
-        <name>email</name>
-        <description>E-mail address of the Individual</description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </objectType>
-
-    <objectType>
-      <vodml-id>party.Organization</vodml-id>
-      <name>Organization</name>
-      <description>Extension of Party for any Organization or Institution.</description>
-      <extends>
-        <vodml-ref>provenance:party.Party</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>party.Organization.address</vodml-id>
-        <name>address</name>
-        <description>Mailing address.  The value is expressed as a single string containing all components of the address. 
-</description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>party.Organization.phone</vodml-id>
-        <name>phone</name>
-        <description>Phone number.  The value is expressed as a string according to the format appropriate for the locale.</description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>party.Organization.email</vodml-id>
-        <name>email</name>
-        <description>E-mail address of the Organization.
-</description>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>party.Organization.logo</vodml-id>
-        <name>logo</name>
-        <description>URL pointer to a graphical logo associated with the Organization.</description>
-        <datatype>
-          <vodml-ref>provenance:ivoa.anyURI</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </objectType>
-
-  </package>
-
-
-
-  <package>
     <vodml-id>provenance</vodml-id>
     <name>provenance</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+    <description>This document provides a data model for describing provenance.</description>
     <enumeration>
       <vodml-id>provenance.AgentRole</vodml-id>
       <name>AgentRole</name>
@@ -1477,9 +249,7 @@
       <attribute>
         <vodml-id>provenance.Activity.id</vodml-id>
         <name>id</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+        <description><Enter note text here></description>
         <datatype>
           <vodml-ref>provenance:string</vodml-ref>
         </datatype>
@@ -1489,11 +259,9 @@
         </multiplicity>
       </attribute>
       <attribute>
-        <vodml-id>provenance.Activity.label</vodml-id>
-        <name>label</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+        <vodml-id>provenance.Activity.name</vodml-id>
+        <name>name</name>
+        <description><Enter note text here></description>
         <datatype>
           <vodml-ref>provenance:string</vodml-ref>
         </datatype>
@@ -1651,11 +419,9 @@
         </multiplicity>
       </attribute>
       <attribute>
-        <vodml-id>provenance.ActivityDescription.label</vodml-id>
-        <name>label</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+        <vodml-id>provenance.ActivityDescription.name</vodml-id>
+        <name>name</name>
+        <description><Enter note text here></description>
         <datatype>
           <vodml-ref>provenance:string</vodml-ref>
         </datatype>
@@ -1707,8 +473,8 @@
         </multiplicity>
       </attribute>
       <attribute>
-        <vodml-id>provenance.ActivityDescription.docuLink</vodml-id>
-        <name>docuLink</name>
+        <vodml-id>provenance.ActivityDescription.doculink</vodml-id>
+        <name>doculink</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1785,8 +551,8 @@
         </multiplicity>
       </attribute>
       <attribute>
-        <vodml-id>provenance.Entity.label</vodml-id>
-        <name>label</name>
+        <vodml-id>provenance.Entity.name</vodml-id>
+        <name>name</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1827,11 +593,9 @@
         </multiplicity>
       </attribute>
       <attribute>
-        <vodml-id>provenance.Entity.access</vodml-id>
-        <name>access</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+        <vodml-id>provenance.Entity.rights</vodml-id>
+        <name>rights</name>
+        <description><Enter note text here></description>
         <datatype>
           <vodml-ref>provenance:string</vodml-ref>
         </datatype>
@@ -1933,8 +697,8 @@
         </multiplicity>
       </attribute>
       <attribute>
-        <vodml-id>provenance.EntityDescription.label</vodml-id>
-        <name>label</name>
+        <vodml-id>provenance.EntityDescription.name</vodml-id>
+        <name>name</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1961,22 +725,8 @@
         </multiplicity>
       </attribute>
       <attribute>
-        <vodml-id>provenance.EntityDescription.dataproduct_type</vodml-id>
-        <name>dataproduct_type</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>provenance:string</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>provenance.EntityDescription.dataproduct_subtype</vodml-id>
-        <name>dataproduct_subtype</name>
+        <vodml-id>provenance.EntityDescription.category</vodml-id>
+        <name>category</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -1989,22 +739,8 @@
         </multiplicity>
       </attribute>
       <attribute>
-        <vodml-id>provenance.EntityDescription.level</vodml-id>
-        <name>level</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>provenance:integer</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>provenance.EntityDescription.docu_link</vodml-id>
-        <name>docu_link</name>
+        <vodml-id>provenance.EntityDescription.doculink</vodml-id>
+        <name>doculink</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -2044,20 +780,6 @@
           <maxOccurs>-1</maxOccurs>
         </multiplicity>
       </collection>
-      <collection>
-        <vodml-id>provenance.EntityDescription.dataset</vodml-id>
-        <name>dataset</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>Dataset Metadata:dataset</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </collection>
     </objectType>
 
     <objectType>
@@ -2066,6 +788,20 @@
       <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
+      <attribute>
+        <vodml-id>provenance.Used.role</vodml-id>
+        <name>role</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <datatype>
+          <vodml-ref>provenance:string</vodml-ref>
+        </datatype>
+        <multiplicity>
+          <minOccurs>1</minOccurs>
+          <maxOccurs>1</maxOccurs>
+        </multiplicity>
+      </attribute>
       <reference>
         <vodml-id>provenance.Used.usedDescription</vodml-id>
         <name>usedDescription</name>
@@ -2088,6 +824,20 @@
       <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
+      <attribute>
+        <vodml-id>provenance.WasGeneratedBy.role</vodml-id>
+        <name>role</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <datatype>
+          <vodml-ref>provenance:string</vodml-ref>
+        </datatype>
+        <multiplicity>
+          <minOccurs>1</minOccurs>
+          <maxOccurs>1</maxOccurs>
+        </multiplicity>
+      </attribute>
       <reference>
         <vodml-id>provenance.WasGeneratedBy.wasGeneratedByDescription</vodml-id>
         <name>wasGeneratedByDescription</name>
@@ -2161,20 +911,6 @@
         </multiplicity>
       </attribute>
       <collection>
-        <vodml-id>provenance.Agent.party</vodml-id>
-        <name>party</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>provenance:party.Party</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>0</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </collection>
-      <collection>
         <vodml-id>provenance.Agent.wasAttributedTo</vodml-id>
         <name>wasAttributedTo</name>
         <description>
@@ -2304,7 +1040,7 @@
       <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <collection>
+      <reference>
         <vodml-id>provenance.HadStep.activity</vodml-id>
         <name>activity</name>
         <description>
@@ -2317,7 +1053,7 @@
           <minOccurs>1</minOccurs>
           <maxOccurs>1</maxOccurs>
         </multiplicity>
-      </collection>
+      </reference>
     </objectType>
 
     <objectType>
@@ -2407,8 +1143,8 @@
         </multiplicity>
       </attribute>
       <attribute>
-        <vodml-id>provenance.ParameterDescription.label</vodml-id>
-        <name>label</name>
+        <vodml-id>provenance.ParameterDescription.name</vodml-id>
+        <name>name</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>

Added: trunk/projects/dm/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml.validation-report.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml.validation-report.txt	Fri May  5 15:01:21 2017	(r4016)
@@ -0,0 +1,258 @@
+
+-------
+error:
+-------provenance:provenance.WasGeneratedBy is used more than once, namely 2 times as target of composition relation.
+ (this message will repeat itself 2 times!)
+    
+-------
+error:
+-------provenance:provenance.Used is used more than once, namely 2 times as target of composition relation.
+ (this message will repeat itself 2 times!)
+    
+-------
+error:
+-------provenance:provenance.WasAssociatedWith is used more than once, namely 2 times as target of composition relation.
+ (this message will repeat itself 2 times!)
+    
+-------
+error:
+-------provenance:provenance.UsedDescription is used more than once, namely 2 times as target of composition relation.
+ (this message will repeat itself 2 times!)
+    
+-------
+error:
+-------provenance:provenance.WasGeneratedByDescription is used more than once, namely 2 times as target of composition relation.
+ (this message will repeat itself 2 times!)
+    
+-------
+error:
+-------provenance:provenance.WasGeneratedBy is used more than once, namely 2 times as target of composition relation.
+ (this message will repeat itself 2 times!)
+    
+-------
+error:
+-------provenance:provenance.Used is used more than once, namely 2 times as target of composition relation.
+ (this message will repeat itself 2 times!)
+    
+-------
+error:
+-------provenance:provenance.WasAttributedTo is used more than once, namely 2 times as target of composition relation.
+ (this message will repeat itself 2 times!)
+    
+-------
+error:
+-------provenance:provenance.WasGeneratedByDescription is used more than once, namely 2 times as target of composition relation.
+ (this message will repeat itself 2 times!)
+    
+-------
+error:
+-------provenance:provenance.UsedDescription is used more than once, namely 2 times as target of composition relation.
+ (this message will repeat itself 2 times!)
+    
+-------
+error:
+-------provenance:provenance.WasAttributedTo is used more than once, namely 2 times as target of composition relation.
+ (this message will repeat itself 2 times!)
+    
+-------
+error:
+-------provenance:provenance.WasAssociatedWith is used more than once, namely 2 times as target of composition relation.
+ (this message will repeat itself 2 times!)
+    
+-------
+error:
+-------
+datatype  of ivoa.IntegerQuantity.value is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of experiment.Observation.observationID is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of experiment.ObsConfig.bandpass is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of experiment.ObsConfig.datasource is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of experiment.BaseTarget.name is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of experiment.BaseTarget.description is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of experiment.Target.objectClass is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of experiment.AstroTarget.objectClass is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of experiment.AstroTarget.spectralClass is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of experiment.Instrument.name is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of experiment.Proposal.identifier is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of experiment.ObsDataset.calibLevel is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of experiment.DerivedScalar.name is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of dataset.DataModel.name is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of dataset.DataModel.prefix is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of dataset.Dataset.dataProductSubtype is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of dataset.DataID.title is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of dataset.DataID.version is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of dataset.Curation.version is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of dataset.Contributor.acknowledgment is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of dataset.Publication.refCode is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of dataset.Collection.name is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of party.Party.name is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of party.Individual.address is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of party.Individual.phone is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of party.Individual.email is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of party.Organization.address is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of party.Organization.phone is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of party.Organization.email is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype Dataset Metadata:dataset of collection provenance.EntityDescription.dataset is not an object type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of provenance.Parameter.id is not a value type but a 'ERROR'
+    
+-------
+error:
+-------
+datatype  of provenance.Parameter.value is not a value type but a 'ERROR'
+    [schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:52:21: cvc-pattern-valid: Value '' is not facet-valid with respect to pattern '[\w_\-]+:[\w\-/\._]+' for type 'VODMLREF'.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:52:21: cvc-type.3.1.3: The value '' of element 'vodml-ref' is not valid.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:63:21: cvc-pattern-valid: Value '' is not facet-valid with respect to pattern '[\w_\-]+:[\w\-/\._]+' for type 'VODMLREF'.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:63:21: cvc-type.3.1.3: The value '' of element 'vodml-ref' is not valid.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:144:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:236:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:306:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:321:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:363:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:373:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:404:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:423:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:433:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:497:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:514:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:571:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:671:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:873:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:883:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:927:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:970:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:1006:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:1096:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:1232:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:1247:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:1263:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:1286:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:1322:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:1331:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:1340:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:1359:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:1368:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:1378:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:2054:58: cvc-pattern-valid: Value 'Dataset Metadata:dataset' is not facet-valid with respect to pattern '[\w_\-]+:[\w\-/\._]+' for type 'VODMLREF'.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:2054:58: cvc-type.3.1.3: The value 'Dataset Metadata:dataset' of element 'vodml-ref' is not valid.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:2357:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml:2368:23: cvc-complex-type.2.4.a: Invalid content was found starting with element 'multiplicity'. One of '{datatype}' is expected.
+[schemavalidate] /home/kristin/E-Science/GAVO/ProvenanceDataModel/svn/vo-dml/models/provenancedm/ProvenanceDM.vo-dml.xml is not a valid XML document

Modified: trunk/projects/dm/vo-dml/models/provenancedm/README.txt
==============================================================================
--- trunk/projects/dm/vo-dml/models/provenancedm/README.txt	Fri May  5 13:55:33 2017	(r4015)
+++ trunk/projects/dm/vo-dml/models/provenancedm/README.txt	Fri May  5 15:01:21 2017	(r4016)
@@ -1,4 +1,24 @@
 VODML-version of Provenance Data Model.
-This is NOT finished yet, we are just testing things.
 
-16.12.2016
+This version may still change at any time, also see the current working draft in ../../../provenance/description/
+
+For recreating the vodml-xml, html documentation etc., do the following (usual) steps:
+
+* copy latest xmi version to this directory:
+  cp ../../../provenance/datamodel-diagrams/provenance.xmi .
+
+* adjust build.properties in vo-dml's base directory:
+  cd ../../
+  vi build.properties
+
+  -> set here "models=./models/provenancedm"
+
+* create the provenancedm.vo-dml.xml file:
+  ant run_xmi2vo-dml
+
+  - if error: No uml:Model found, edit the xmi-file directly and patch the xmi namespace:
+    xmlns:uml="http://www.omg.org/spec/UML/20100901/"
+
+* create the html documentation:
+  ant run_vo-dml2html
+

Modified: trunk/projects/dm/vo-dml/models/provenancedm/provenance.xmi
==============================================================================
--- trunk/projects/dm/vo-dml/models/provenancedm/provenance.xmi	Fri May  5 13:55:33 2017	(r4015)
+++ trunk/projects/dm/vo-dml/models/provenancedm/provenance.xmi	Fri May  5 15:01:21 2017	(r4016)
@@ -1,1307 +1,389 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:IVOA_UML_Profile="http:///schemas/IVOA_UML_Profile/_DOCcMMN3EeaZSLuq8Cw0GA/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.omg.org/spec/UML/20100901" xmi:version="2.1" xsi:schemaLocation="http://www.eclipse.org/uml2/3.0.0/UML http://schema.omg.org/spec/UML/20110701 http:///schemas/IVOA_UML_Profile/_DOCcMMN3EeaZSLuq8Cw0GA/0 IVOA_UML_Profile.profile.xmi#_DOFfh8N3EeaZSLuq8Cw0GA">
-  <uml:Model xmi:id="_DN5SQMN3EeaZSLuq8Cw0GA" name="provenance">
-    <eAnnotations xmi:id="_DN5SQcN3EeaZSLuq8Cw0GA" source="Objing">
-      <contents xmi:type="uml:Property" xmi:id="_DN5SQsN3EeaZSLuq8Cw0GA" name="exporterVersion">
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_DN5SQ8N3EeaZSLuq8Cw0GA" value="3.0.0"/>
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:IVOA_UML_Profile="http:///schemas/IVOA_UML_Profile/_5wpykDGREee_69jl7_GsIw/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.omg.org/spec/UML/20100901" xmi:version="2.1" xsi:schemaLocation="http://www.eclipse.org/uml2/3.0.0/UML http://schema.omg.org/spec/UML/20110701 http:///schemas/IVOA_UML_Profile/_5wpykDGREee_69jl7_GsIw/0 IVOA_UML_Profile.profile.xmi#_5wqZpzGREee_69jl7_GsIw">
+  <uml:Model xmi:id="_5wokcDGREee_69jl7_GsIw" name="provenance">
+    <eAnnotations xmi:id="_5wokcTGREee_69jl7_GsIw" source="Objing">
+      <contents xmi:type="uml:Property" xmi:id="_5wokcjGREee_69jl7_GsIw" name="exporterVersion">
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_5wokczGREee_69jl7_GsIw" value="3.0.0"/>
       </contents>
     </eAnnotations>
-    <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SRMN3EeaZSLuq8Cw0GA">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_5wokdDGREee_69jl7_GsIw">
       <body>This document provides a data model describing the structure and content of generic Dataset metadata for the IVOA.  This is a high-level model which is to be referenced and extended by other models describing specific types of Datasets and Data products.  In this document, we specify the generic Dataset, as well as an ObservationDataset model which covers the class of Datasets which are derived from an Observation.  At the time of this writing, there is no formal Observation-Experiment model for the IVOA, so we include a hypothetical Observation-Experiment model to serve as a placeholder. 
 </body>
     </ownedComment>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_DN5SRcN3EeaZSLuq8Cw0GA" constrainedElement="_DN55a8N3EeaZSLuq8Cw0GA">
-      <specification xmi:type="uml:LiteralString" xmi:id="_DN5SRsN3EeaZSLuq8Cw0GA" value="ds:party.Role.party"/>
-    </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_DN5SR8N3EeaZSLuq8Cw0GA" constrainedElement="_DN56SsN3EeaZSLuq8Cw0GA">
-      <specification xmi:type="uml:LiteralString" xmi:id="_DN5SSMN3EeaZSLuq8Cw0GA" value="ds:party.Role.party"/>
-    </ownedRule>
-    <packagedElement xmi:type="uml:Package" xmi:id="_DN5SScN3EeaZSLuq8Cw0GA" name="ivoa">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SSsN3EeaZSLuq8Cw0GA">
+    <packagedElement xmi:type="uml:Package" xmi:id="_5wokdTGREee_69jl7_GsIw" name="ivoa">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_5wokdjGREee_69jl7_GsIw">
         <body>Base Data Types V1.0 (2014)</body>
       </ownedComment>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_DN5SS8N3EeaZSLuq8Cw0GA" name="real"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_DN5STMN3EeaZSLuq8Cw0GA" name="nonnegativeinteger"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_DN5STcN3EeaZSLuq8Cw0GA" name="datetime"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_DN5STsN3EeaZSLuq8Cw0GA" name="anyURI">
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN5ST8N3EeaZSLuq8Cw0GA">
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5wokdzGREee_69jl7_GsIw" name="real"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5wokeDGREee_69jl7_GsIw" name="nonnegativeinteger"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5wokeTGREee_69jl7_GsIw" name="datetime"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5wokejGREee_69jl7_GsIw" name="anyURI">
+        <generalization xmi:type="uml:Generalization" xmi:id="_5wokezGREee_69jl7_GsIw">
           <general xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
         </generalization>
       </packagedElement>
-      <packagedElement xmi:type="uml:InformationItem" xmi:id="_DN5SUMN3EeaZSLuq8Cw0GA" name="IVOA Base Types V1.0 (2016)"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_DN5SUcN3EeaZSLuq8Cw0GA" name="Unit">
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN5SUsN3EeaZSLuq8Cw0GA">
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5wokfDGREee_69jl7_GsIw" name="Unit">
+        <generalization xmi:type="uml:Generalization" xmi:id="_5wokfTGREee_69jl7_GsIw">
           <general xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
         </generalization>
       </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_DN5SU8N3EeaZSLuq8Cw0GA" name="Quantity" isAbstract="true">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5SVMN3EeaZSLuq8Cw0GA" name="unit" visibility="public" type="_DN5SUcN3EeaZSLuq8Cw0GA" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN5SVcN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_5wokfjGREee_69jl7_GsIw" name="Quantity" isAbstract="true">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokfzGREee_69jl7_GsIw" name="unit" visibility="public" type="_5wokfDGREee_69jl7_GsIw" isUnique="false">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wokgDGREee_69jl7_GsIw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_DN5SVsN3EeaZSLuq8Cw0GA" name="IntegerQuantity">
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN5SV8N3EeaZSLuq8Cw0GA" general="_DN5SU8N3EeaZSLuq8Cw0GA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5SWMN3EeaZSLuq8Cw0GA" name="value" visibility="public" isUnique="false">
+      <packagedElement xmi:type="uml:DataType" xmi:id="_5wokgTGREee_69jl7_GsIw" name="IntegerQuantity">
+        <generalization xmi:type="uml:Generalization" xmi:id="_5wokgjGREee_69jl7_GsIw" general="_5wokfjGREee_69jl7_GsIw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokgzGREee_69jl7_GsIw" name="value" visibility="public" isUnique="false">
           <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#Integer"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_DN5SWcN3EeaZSLuq8Cw0GA" name="RealQuantity">
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN5SWsN3EeaZSLuq8Cw0GA" general="_DN5SU8N3EeaZSLuq8Cw0GA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5SW8N3EeaZSLuq8Cw0GA" name="value" visibility="public" type="_DN5SS8N3EeaZSLuq8Cw0GA" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_DN5SXMN3EeaZSLuq8Cw0GA" name="string"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_DN5SXcN3EeaZSLuq8Cw0GA" name="boolean"/>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_DN5SXsN3EeaZSLuq8Cw0GA" name="complex">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5SX8N3EeaZSLuq8Cw0GA" name="re" visibility="public" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5SYMN3EeaZSLuq8Cw0GA" name="im" visibility="public" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_DN5SYcN3EeaZSLuq8Cw0GA" name="rational">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5SYsN3EeaZSLuq8Cw0GA" name="numerator" visibility="public" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5SY8N3EeaZSLuq8Cw0GA" name="denominator" visibility="public" isUnique="false"/>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_5wokhDGREee_69jl7_GsIw" name="RealQuantity">
+        <generalization xmi:type="uml:Generalization" xmi:id="_5wokhTGREee_69jl7_GsIw" general="_5wokfjGREee_69jl7_GsIw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokhjGREee_69jl7_GsIw" name="value" visibility="public" type="_5wokdzGREee_69jl7_GsIw" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5wokhzGREee_69jl7_GsIw" name="string"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5wokiDGREee_69jl7_GsIw" name="boolean"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5wokiTGREee_69jl7_GsIw" name="complex">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokijGREee_69jl7_GsIw" name="re" visibility="public" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokizGREee_69jl7_GsIw" name="im" visibility="public" isUnique="false"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5wokjDGREee_69jl7_GsIw" name="rational">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokjTGREee_69jl7_GsIw" name="numerator" visibility="public" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokjjGREee_69jl7_GsIw" name="denominator" visibility="public" isUnique="false"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_DN5SZMN3EeaZSLuq8Cw0GA" name="integer"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_5wokjzGREee_69jl7_GsIw" name="integer"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_DN5SZcN3EeaZSLuq8Cw0GA" name="char">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SZsN3EeaZSLuq8Cw0GA">
-        <body>Characterisation Model V1.13 (2008)</body>
+    <packagedElement xmi:type="uml:Package" xmi:id="_5wokkDGREee_69jl7_GsIw" name="provenance">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_5wokkTGREee_69jl7_GsIw">
+        <body>This document provides a data model for describing provenance.</body>
       </ownedComment>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN5SZ8N3EeaZSLuq8Cw0GA" name="Char"/>
-      <packagedElement xmi:type="uml:InformationItem" xmi:id="_DN5SaMN3EeaZSLuq8Cw0GA" name="Characterisation V1.13 (2008)"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_DN5SacN3EeaZSLuq8Cw0GA" name="stc">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SasN3EeaZSLuq8Cw0GA">
-        <body>Space-Time Coordinates (STC) Model protoype V2.0</body>
-      </ownedComment>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN5Sa8N3EeaZSLuq8Cw0GA" name="AstroCoordSystem"/>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_DN5SbMN3EeaZSLuq8Cw0GA" name="Position"/>
-      <packagedElement xmi:type="uml:InformationItem" xmi:id="_DN5SbcN3EeaZSLuq8Cw0GA" name="STC V2.0 Prototype (2015)"/>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN5SbsN3EeaZSLuq8Cw0GA" memberEnd="_DN55g8N3EeaZSLuq8Cw0GA _DN5Sb8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN5Sb8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN55gMN3EeaZSLuq8Cw0GA" association="_DN5SbsN3EeaZSLuq8Cw0GA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN5ScMN3EeaZSLuq8Cw0GA"/>
-        </ownedEnd>
-      </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_DN5SccN3EeaZSLuq8Cw0GA" name="experiment">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_DN5ScsN3EeaZSLuq8Cw0GA">
-        <body>The Observation Experiment model refers to several elements related to an Observation and its configuration.  As of the time of this writing, there is no IVOA recommendation for a general Observation data model.  The Provenance data model, in progress, will define the pattern for describing the relation between actions and results, and how to record these in datasets.  In lieu of these standards, this document defines a straw-man Observation model.  
-</body>
-      </ownedComment>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN5Sc8N3EeaZSLuq8Cw0GA" name="Observation">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SdMN3EeaZSLuq8Cw0GA">
-          <body>Head class for an Observation Experiment.
-The Observation is modeled as a type of 'Experiment', with some basic structure defined to provide metadata about the observation target and configuration.  The product, or 'result' of the Observation is zero or more ObsDataset objects.  This pattern is inspired by, and compatible with the Simulation Data Model, where a 'Simulation' can be considered another form of 'Experiment' or perhaps even another form of 'Observation'.
-</body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5SdcN3EeaZSLuq8Cw0GA" name="obsConfig" visibility="public" type="_DN5Si8N3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN5SgsN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SdsN3EeaZSLuq8Cw0GA">
-            <body>Observation configuration metadata, provides information about who, where, and how the observation was conducted.
-</body>
-          </ownedComment>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5Sd8N3EeaZSLuq8Cw0GA" name="result" visibility="public" type="_DN55gMN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN5ShMN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SeMN3EeaZSLuq8Cw0GA">
-            <body>The result of an observation is zero or more Observation Datasets.
-</body>
-          </ownedComment>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN5SecN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN5SesN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5Se8N3EeaZSLuq8Cw0GA" name="target" visibility="public" type="_DN5SncN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN5ShsN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SfMN3EeaZSLuq8Cw0GA">
-            <body>The target of the observation.  The content of this object may vary greatly depending on the goals and nature of the observation.  For example, the 'target' could be a galaxy, stellar object, planet, or calibratioin source.  As such, we allow the BaseTarget class here, and permit the users to define and use more content rich flavors according to their needs.</body>
-          </ownedComment>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5SfcN3EeaZSLuq8Cw0GA" name="proposal" visibility="public" type="_DN55ccN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN5SiMN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SfsN3EeaZSLuq8Cw0GA">
-            <body>Identifies any proposal related to the observation.  This field may be used to gather all observations and products related to a particular proposal.
-</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN5Sf8N3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5SgMN3EeaZSLuq8Cw0GA" name="observationID" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SgcN3EeaZSLuq8Cw0GA">
-            <body>Internal ID determined by the data provide to uniquely identify the observation within the institution or entity performing the observation.
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN5SgsN3EeaZSLuq8Cw0GA" memberEnd="_DN5SdcN3EeaZSLuq8Cw0GA _DN5Sg8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN5Sg8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN5Sc8N3EeaZSLuq8Cw0GA" association="_DN5SgsN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN5ShMN3EeaZSLuq8Cw0GA" memberEnd="_DN5Sd8N3EeaZSLuq8Cw0GA _DN5ShcN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN5ShcN3EeaZSLuq8Cw0GA" visibility="public" type="_DN5Sc8N3EeaZSLuq8Cw0GA" association="_DN5ShMN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN5ShsN3EeaZSLuq8Cw0GA" memberEnd="_DN5Se8N3EeaZSLuq8Cw0GA _DN5Sh8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN5Sh8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN5Sc8N3EeaZSLuq8Cw0GA" association="_DN5ShsN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN5SiMN3EeaZSLuq8Cw0GA" memberEnd="_DN5SfcN3EeaZSLuq8Cw0GA _DN5SicN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN5SicN3EeaZSLuq8Cw0GA" visibility="public" type="_DN5Sc8N3EeaZSLuq8Cw0GA" association="_DN5SiMN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:InformationItem" xmi:id="_DN5SisN3EeaZSLuq8Cw0GA" name="Hypothetical Observation Experiment Model"/>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN5Si8N3EeaZSLuq8Cw0GA" name="ObsConfig">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SjMN3EeaZSLuq8Cw0GA">
-          <body>ObsConfig describes all Observation Configuration metadata.  We define a small set of configuration elements which are required as Provenance in the observation dataset.
-</body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5SjcN3EeaZSLuq8Cw0GA" name="facility" visibility="public" type="_DN55aMN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN5SmcN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SjsN3EeaZSLuq8Cw0GA">
-            <body>Metadata pertaining to the facility performing the observation.
-</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN5Sj8N3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5SkMN3EeaZSLuq8Cw0GA" name="instrument" visibility="public" type="_DN55bcN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN5Sm8N3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SkcN3EeaZSLuq8Cw0GA">
-            <body>Metadata pertaining to the instrument used to create the data.</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN5SksN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5Sk8N3EeaZSLuq8Cw0GA" name="bandpass" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SlMN3EeaZSLuq8Cw0GA">
-            <body>Describes the spectral domain of the observation in a very general sense.  
-  The value may be expressed in terms of general spectral bands, or specific bandpass names.  If multiple bands are covered, the value may be a comma delimited combination of appropriate bands.  If expressed as general bands, the value(s) must be selected from the enumerated set given by the SpectralBand type.  There is no controlled vocabulary for specific bandpass names as the list is too long to enumerate.  Effort should be made to use highly recognized bandpass names (eg: "U","V","B","R","I", "H-alpha").
-  This field corresponds to both the Coverage.Spectral and Coverage.Spectral.Bandpass fields of the Resource Metadata document.
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN5SlcN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5SlsN3EeaZSLuq8Cw0GA" name="datasource" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN5Sl8N3EeaZSLuq8Cw0GA">
-            <body>Describes the original source of the data in a very general fashion.  In other words, "What sort of observation originally generated the data?"  Suggested values include:
-  + survey: Survey data typically covers some region of observational parameter space with as complete as possible coverage within that region.
-  + pointed:  Pointed data of a particular object or field.
-  + theory:  Theory data, generated based on a theoretical model.
-  + artificial:  Artificial, or simulated data.  Similar to 'theory', but not necessarily based on a theoretical model.
-  + custom:  Custom data, as part of a specific research project.
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN5SmMN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN5SmcN3EeaZSLuq8Cw0GA" memberEnd="_DN5SjcN3EeaZSLuq8Cw0GA _DN5SmsN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN5SmsN3EeaZSLuq8Cw0GA" visibility="public" type="_DN5Si8N3EeaZSLuq8Cw0GA" association="_DN5SmcN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN5Sm8N3EeaZSLuq8Cw0GA" memberEnd="_DN5SkMN3EeaZSLuq8Cw0GA _DN5SnMN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN5SnMN3EeaZSLuq8Cw0GA" visibility="public" type="_DN5Si8N3EeaZSLuq8Cw0GA" association="_DN5Sm8N3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN5SncN3EeaZSLuq8Cw0GA" name="BaseTarget" isAbstract="true">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SnsN3EeaZSLuq8Cw0GA">
-          <body>Abstract base class for the Target object tree.  The target object provides identifying metadata related to the subject or goal of the experiment.  For an Observational experiment, this would typically be an astronomical object.  The BaseTarget class defines high-level identifying information, and must be extended for particular classes of Target which may define additional  characteristics.
-</body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5Sn8N3EeaZSLuq8Cw0GA" name="name" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SoMN3EeaZSLuq8Cw0GA">
-            <body>The target name.  The primary purpose of this field is to provide the user with a recognizable identity of the particular subject or goal.  However, since this may be a query-able field in data discovery protocols, care should be taken to use values which follow conventions for the domain appropriate for the data.  For an astronomical object, this may be a name suitable for use within a domain-specific resolution service.  Simulated data might also use this sort of name (if simulating a particular object), or a more generic term such as "G2V star". 
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5SocN3EeaZSLuq8Cw0GA" name="description" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN5SosN3EeaZSLuq8Cw0GA">
-            <body>Free form description of target.
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN5So8N3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55UMN3EeaZSLuq8Cw0GA" name="position" visibility="public" type="_DN5SbMN3EeaZSLuq8Cw0GA" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55UcN3EeaZSLuq8Cw0GA">
-            <body>This field provides the spatial location of the target.  The value is an STC Position object which supports all required dimensionality and coordinate frame specification needs.
- </body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55UsN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN55U8N3EeaZSLuq8Cw0GA" name="Target">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN55VMN3EeaZSLuq8Cw0GA">
-          <body>General purpose Target object.</body>
-        </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN55VcN3EeaZSLuq8Cw0GA" general="_DN5SncN3EeaZSLuq8Cw0GA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55VsN3EeaZSLuq8Cw0GA" name="objectClass" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55V8N3EeaZSLuq8Cw0GA">
-            <body>General classification or type of the target.  This field supports the discovery of data pertaining to a common class.  e.g. "Star", "Galaxy", "AGN".  At the time of this writing, there is no IVOA recommended vocabulary for this field.  The SIMBAD and NED databases use defined vocabularies for astronomical object classifications which may serve as the basis for such.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55WMN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN55WcN3EeaZSLuq8Cw0GA" name="AstroTarget">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN55WsN3EeaZSLuq8Cw0GA">
-          <body>Extension of BaseTarget specialized for astronomical objects.  The AstroTarget defines additional astronomical properties of the target.</body>
-        </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN55W8N3EeaZSLuq8Cw0GA" general="_DN5SncN3EeaZSLuq8Cw0GA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55XMN3EeaZSLuq8Cw0GA" name="objectClass" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55XcN3EeaZSLuq8Cw0GA">
-            <body>General classification or type of the target.  This field supports the discovery of data pertaining to a common class.  e.g. "Star", "Galaxy", "AGN".  At the time of this writing, there is no IVOA recommended vocabulary for this field.  The SIMBAD and NED databases use defined vocabularies for astronomical object classifications which may serve as the basis for such.
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55XsN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55X8N3EeaZSLuq8Cw0GA" name="spectralClass" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55YMN3EeaZSLuq8Cw0GA">
-            <body>Spectral class of the object.  As with objectClass, there is no IVOA recommended vocabulary for specifying the spectral class of an object.  There is an IVOA Note on the subject entitled "An encoding system to represent stellar spectral classes in archival databases and catalogs", describing an encoding system which has been adopted by the MAST archive.
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55YcN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55YsN3EeaZSLuq8Cw0GA" name="redshift" visibility="public" type="_DN5SS8N3EeaZSLuq8Cw0GA" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55Y8N3EeaZSLuq8Cw0GA">
-            <body>This field gives the canonical redshift of the astronomical object.  It is normally used to store the cosmological redshift of extragalactic objects, although it may also be used to store the observed redshift of Galactic sources if that information is felt by the data provider to be useful.
-</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55ZMN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55ZcN3EeaZSLuq8Cw0GA" name="varAmpl" visibility="public" type="_DN5SS8N3EeaZSLuq8Cw0GA" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55ZsN3EeaZSLuq8Cw0GA">
-            <body>Canonical variability amplitude attributed to the target.
-</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55Z8N3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN55aMN3EeaZSLuq8Cw0GA" name="Facility">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN55acN3EeaZSLuq8Cw0GA">
-          <body>Facility performing the observation.
-</body>
-        </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN55asN3EeaZSLuq8Cw0GA" general="_DN56asN3EeaZSLuq8Cw0GA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55a8N3EeaZSLuq8Cw0GA" name="party" visibility="public" type="_DN56fcN3EeaZSLuq8Cw0GA" association="_DN56YMN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55bMN3EeaZSLuq8Cw0GA">
-            <body>Reference to the Party or Entity which is associated with this role.</body>
-          </ownedComment>
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wokkjGREee_69jl7_GsIw" name="Activity">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokkzGREee_69jl7_GsIw" name="activityDescription" visibility="public" type="_5wokuzGREee_69jl7_GsIw" association="_5wokrTGREee_69jl7_GsIw">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5woklDGREee_69jl7_GsIw"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5woklTGREee_69jl7_GsIw" name="wasGeneratedBy" visibility="public" type="_5wolFDGREee_69jl7_GsIw" aggregation="composite" association="_5woksTGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wokljGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5woklzGREee_69jl7_GsIw"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokmDGREee_69jl7_GsIw" name="used" visibility="public" type="_5wolDDGREee_69jl7_GsIw" aggregation="composite" association="_5wokszGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wokmTGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wokmjGREee_69jl7_GsIw"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokmzGREee_69jl7_GsIw" name="activity" visibility="public" type="_5wokkjGREee_69jl7_GsIw" association="_5woktTGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5woknDGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5woknTGREee_69jl7_GsIw"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5woknjGREee_69jl7_GsIw" name="wasAssociatedWith" visibility="public" type="_5wolKzGREee_69jl7_GsIw" aggregation="composite" association="_5woktzGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5woknzGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wokoDGREee_69jl7_GsIw"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokoTGREee_69jl7_GsIw" name="parameter" visibility="public" type="_5wolUDGREee_69jl7_GsIw" aggregation="composite" association="_5wokuTGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wokojGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wokozGREee_69jl7_GsIw"/>
         </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN55bcN3EeaZSLuq8Cw0GA" name="Instrument">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN55bsN3EeaZSLuq8Cw0GA">
-          <body>Identifies the instrument used to create the data.  This can be a specific instrument name, general type or something else, such as a program in the case of theoretical data.   (RM:Collection.Instrument) </body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55b8N3EeaZSLuq8Cw0GA" name="name" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55cMN3EeaZSLuq8Cw0GA">
-            <body>Name of the instrument.
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN55ccN3EeaZSLuq8Cw0GA" name="Proposal">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN55csN3EeaZSLuq8Cw0GA">
-          <body>Metadata related to the proposal or document which spawned the observation.
-</body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55c8N3EeaZSLuq8Cw0GA" name="identifier" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55dMN3EeaZSLuq8Cw0GA">
-            <body>Tag used to uniquely identify a particular proposal within the institution or entity.
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN55dcN3EeaZSLuq8Cw0GA" name="Characterisation">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN55dsN3EeaZSLuq8Cw0GA">
-          <body>This Characterisation object is a direct extension of the Characterisation object from the IVOA Characterisation Data Model Standard.  This provides a local object which may be contained in a 'composition' relation to other objects of this model (specifically ObsDataset).  This object may be extended and/or modified by specific Dataset models as needed.
-	Characterisation provides a broad scale description of the coordinate space occupied by the dataset in each of the axis domains.  This includes axes not directly represented in the dataset 'data', for example, the Time axis of a 2D special image.  As such, there is a strong correlation between Characterisation and Data objects.  In some cases, the values may be directly derived from the Data, in others, they provide supporting metadata about the broader domain.  For example, the Accuracy fields in Characterisation represent typical accuracy for the dataset, while those within Data provide per-data-point errors.   </body>
-        </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN55d8N3EeaZSLuq8Cw0GA" general="_DN5SZ8N3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN55eMN3EeaZSLuq8Cw0GA" name="Derived">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN55ecN3EeaZSLuq8Cw0GA">
-          <body>The Derived (short for Derived Data) object holds derived information obtained by evaluating or analyzing the contents of the dataset.  The specific content of this object is strongly dependent on the specific type of dataset, so we provide a generic model which may be specialized in other models to define elements appropriate for that type of dataset.
-
-The primary purpose of this object is to provide a common framework in which specific information may be placed to aid in discovery and filtering of datasets in various access protocols.
- </body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55esN3EeaZSLuq8Cw0GA" name="derivedElement" visibility="public" type="_DN55pMN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN55fsN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55e8N3EeaZSLuq8Cw0GA">
-            <body>Collection of zero or more DerivedElement objects, each of which provides a specific quantity obtained by analyzing the dataset content.
-</body>
-          </ownedComment>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN55fMN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55fcN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN55fsN3EeaZSLuq8Cw0GA" memberEnd="_DN55esN3EeaZSLuq8Cw0GA _DN55f8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN55f8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN55eMN3EeaZSLuq8Cw0GA" association="_DN55fsN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN55gMN3EeaZSLuq8Cw0GA" name="ObsDataset" isAbstract="true">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN55gcN3EeaZSLuq8Cw0GA">
-          <body>Abstract object extending Dataset with metadata relevant to datasets derived from Observations.
-</body>
-        </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN55gsN3EeaZSLuq8Cw0GA" general="_DN55ucN3EeaZSLuq8Cw0GA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55g8N3EeaZSLuq8Cw0GA" name="coordSys" visibility="public" type="_DN5Sa8N3EeaZSLuq8Cw0GA" association="_DN5SbsN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55hMN3EeaZSLuq8Cw0GA">
-            <body>Zero or more references to coordinate system defintions associated with the dataset.  Since multiple data products may contibute to the content of a dataset, this element provides convenient, high-level access to definitions which may be distributed among lower-level objects.  
-</body>
-          </ownedComment>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN55hcN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55hsN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55h8N3EeaZSLuq8Cw0GA" name="target" visibility="public" type="_DN5SncN3EeaZSLuq8Cw0GA" association="_DN55l8N3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55iMN3EeaZSLuq8Cw0GA">
-            <body>Reference to a BaseTarget object from Observation.  Provides metadata describing the target of the observation.</body>
-          </ownedComment>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55icN3EeaZSLuq8Cw0GA" name="proposal" visibility="public" type="_DN55ccN3EeaZSLuq8Cw0GA" association="_DN55msN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55isN3EeaZSLuq8Cw0GA">
-            <body>Reference to Proposal object from Observation.  This object provides metadata identifying any proposal related to the observation which produced the dataset.</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55i8N3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55jMN3EeaZSLuq8Cw0GA" name="obsConfig" visibility="public" type="_DN5Si8N3EeaZSLuq8Cw0GA" association="_DN55ncN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55jcN3EeaZSLuq8Cw0GA">
-            <body>Reference to ObsConfig object from Observation.  This object provides some high-level metadata related to the observation configuration.</body>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokpDGREee_69jl7_GsIw" name="id" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5wokpTGREee_69jl7_GsIw">
+            <body><Enter note text here></body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55jsN3EeaZSLuq8Cw0GA"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55j8N3EeaZSLuq8Cw0GA" name="characterisation" visibility="public" type="_DN55dcN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN55oMN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55kMN3EeaZSLuq8Cw0GA">
-            <body>Characterisation provides a 'characteristic' view of the dataset coordinate space.  For each represented domain (spatial, spectral, temporal, etc), characterisation provides metadata summarizing the coverage, resolution, representative accuracies, etc. for the dataset asa a whole.</body>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokpjGREee_69jl7_GsIw" name="name" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5wokpzGREee_69jl7_GsIw">
+            <body><Enter note text here></body>
           </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wokqDGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55kcN3EeaZSLuq8Cw0GA" name="derived" visibility="public" type="_DN55eMN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN55osN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55ksN3EeaZSLuq8Cw0GA">
-            <body>Provides a high level summary of certain properties of the dataset.  Its primary purpose is to support high level filtering of datasets during data discovery.
-</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55k8N3EeaZSLuq8Cw0GA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokqTGREee_69jl7_GsIw" name="startTime" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokqjGREee_69jl7_GsIw" name="endTime" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokqzGREee_69jl7_GsIw" name="annotation" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wokrDGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55lMN3EeaZSLuq8Cw0GA" name="calibLevel" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55lcN3EeaZSLuq8Cw0GA">
-            <body>High level classification for the calibration level of the particular dataset as a whole.  The calibration level concept conveys to the user information on how much data reduction/processing has been applied to the data.  It is up to the data providers to consider how to map their own internal classification to the scale defined here.
-Scale:
-* 0 - Raw instrumental data, in a proprietary or internal data-provider defined format.
-* 1 - Instrumental data in a standard format (FITS, VOTable, etc )
-* 2 - Calibrated, science ready data with the instrument signature removed.
-* 3 - Enhanced data products like mosaics, resampled or drizzled images, or heavily processed survey fields.  Level 3 data products may represent the combination of data from multiple primary observations.
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#Integer"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55lsN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN55l8N3EeaZSLuq8Cw0GA" memberEnd="_DN55h8N3EeaZSLuq8Cw0GA _DN55mMN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN55mMN3EeaZSLuq8Cw0GA" visibility="public" type="_DN55gMN3EeaZSLuq8Cw0GA" association="_DN55l8N3EeaZSLuq8Cw0GA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55mcN3EeaZSLuq8Cw0GA"/>
-        </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN55msN3EeaZSLuq8Cw0GA" memberEnd="_DN55icN3EeaZSLuq8Cw0GA _DN55m8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN55m8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN55gMN3EeaZSLuq8Cw0GA" association="_DN55msN3EeaZSLuq8Cw0GA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55nMN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wokrTGREee_69jl7_GsIw" memberEnd="_5wokkzGREee_69jl7_GsIw _5wokrjGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wokrjGREee_69jl7_GsIw" visibility="public" type="_5wokkjGREee_69jl7_GsIw" association="_5wokrTGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wokrzGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5woksDGREee_69jl7_GsIw"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN55ncN3EeaZSLuq8Cw0GA" memberEnd="_DN55jMN3EeaZSLuq8Cw0GA _DN55nsN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN55nsN3EeaZSLuq8Cw0GA" visibility="public" type="_DN55gMN3EeaZSLuq8Cw0GA" association="_DN55ncN3EeaZSLuq8Cw0GA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55n8N3EeaZSLuq8Cw0GA"/>
-        </ownedEnd>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN55oMN3EeaZSLuq8Cw0GA" memberEnd="_DN55j8N3EeaZSLuq8Cw0GA _DN55ocN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN55ocN3EeaZSLuq8Cw0GA" visibility="public" type="_DN55gMN3EeaZSLuq8Cw0GA" association="_DN55oMN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN55osN3EeaZSLuq8Cw0GA" memberEnd="_DN55kcN3EeaZSLuq8Cw0GA _DN55o8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN55o8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN55gMN3EeaZSLuq8Cw0GA" association="_DN55osN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN55pMN3EeaZSLuq8Cw0GA" name="DerivedElement" isAbstract="true">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN55pcN3EeaZSLuq8Cw0GA">
-          <body>Abstract base for defining derived data elements.  Typically, models for specific data products would extend this object to define various elements appropriate for that model.  For example, the Spectrum model could define signal-to-noise ratio (SNR), or TimeSeries could define period, or variability.  We put no restriction on the DerivedElement content since the result could be a simple value or a complex object.  However, it is recommended that extensions be simple and compact in keeping with the primary intent of use in data discovery.
-</body>
-        </ownedComment>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN55psN3EeaZSLuq8Cw0GA" name="DerivedScalar">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN55p8N3EeaZSLuq8Cw0GA">
-          <body>Simple extension of DerivedElement class which can serve many use cases.  Usages of this object in other models to define specific elements should explicitly define the element name, and the process by which the value is determined.
-</body>
-        </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN55qMN3EeaZSLuq8Cw0GA" general="_DN55pMN3EeaZSLuq8Cw0GA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55qcN3EeaZSLuq8Cw0GA" name="name" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55qsN3EeaZSLuq8Cw0GA">
-            <body>Name identifying the derived element.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55q8N3EeaZSLuq8Cw0GA" name="value" visibility="public" type="_DN5SU8N3EeaZSLuq8Cw0GA" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55rMN3EeaZSLuq8Cw0GA">
-            <body>Value of the derived element.
-</body>
-          </ownedComment>
-        </ownedAttribute>
-      </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_DN55rcN3EeaZSLuq8Cw0GA" name="dataset">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_DN55rsN3EeaZSLuq8Cw0GA">
-        <body>Dataset Metadata package</body>
-      </ownedComment>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN55r8N3EeaZSLuq8Cw0GA" name="DataModel">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN55sMN3EeaZSLuq8Cw0GA">
-          <body>This object provides specific information regarding the data model and version thereof that a dataset represents.  This information is primarily an aide to (de)serialization of the dataset.  As such, it would better be defined by serialization conventions.  In lieu of such conventions, we include this object and representative serialization examples for the primary file formats VOTable and FITS.
-</body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55scN3EeaZSLuq8Cw0GA" name="name" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55ssN3EeaZSLuq8Cw0GA">
-            <body>Formatted string providing the name and version of the model document.  The format speficication is "[name]-[version].[subversion]". Each derived model should specifically state the appropriate string for this field.
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55s8N3EeaZSLuq8Cw0GA" name="prefix" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55tMN3EeaZSLuq8Cw0GA">
-            <body>Prefix string used in UType string for elements associated with the model.  For IVOA standard models, this will be a predetermined string (e.g. 'stc' or 'spec').  Extended, or user defined content can specify a unique prefix for their own content.
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55tcN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55tsN3EeaZSLuq8Cw0GA" name="URL" visibility="public" type="_DN5STsN3EeaZSLuq8Cw0GA" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55t8N3EeaZSLuq8Cw0GA">
-            <body>URL pointer to the XML schema associated with the model.
-</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55uMN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN55ucN3EeaZSLuq8Cw0GA" name="Dataset" isAbstract="true">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN55usN3EeaZSLuq8Cw0GA">
-          <body>Abstract object for the generic IVOA Dataset.  It is intended to be useful for any type of data.  Specific dataset models should extend this object, providing detailed definitions and additional content as appropriate for that type of dataset.
-</body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55u8N3EeaZSLuq8Cw0GA" name="curation" visibility="public" type="_DN557MN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN55xMN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55vMN3EeaZSLuq8Cw0GA">
-            <body>Provides metadata related to the entity responsible for the curation of the dataset.
-</body>
-          </ownedComment>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55vcN3EeaZSLuq8Cw0GA" name="dataID" visibility="public" type="_DN55yMN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN55xsN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55vsN3EeaZSLuq8Cw0GA">
-            <body>DataID provides high level identification metadata for the dataset itself, and any associations with various collections.</body>
-          </ownedComment>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55v8N3EeaZSLuq8Cw0GA" name="dataProductType" visibility="public" type="_DN56CMN3EeaZSLuq8Cw0GA" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55wMN3EeaZSLuq8Cw0GA">
-            <body>Describes the high level scientific classification of the data content.  Values are restricted to the DataProductType enumeration set and convey the general idea of the content and organization of
-a dataset.
-</body>
-          </ownedComment>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55wcN3EeaZSLuq8Cw0GA" name="dataProductSubtype" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55wsN3EeaZSLuq8Cw0GA">
-            <body>Secondary type classification for the dataset.  This field is intended to precisely specify the scientific nature of the data product, possibly in terms relevant only to a specific archive or data collection.  For example, dataProductType='image' could have associated dataProductSubtype="src.image", "bkg.image", "PixelMask", etc.  Values are unrestricted strings.
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55w8N3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN55xMN3EeaZSLuq8Cw0GA" memberEnd="_DN55u8N3EeaZSLuq8Cw0GA _DN55xcN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN55xcN3EeaZSLuq8Cw0GA" visibility="public" type="_DN55ucN3EeaZSLuq8Cw0GA" association="_DN55xMN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5woksTGREee_69jl7_GsIw" memberEnd="_5woklTGREee_69jl7_GsIw _5woksjGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5woksjGREee_69jl7_GsIw" visibility="public" type="_5wokkjGREee_69jl7_GsIw" association="_5woksTGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN55xsN3EeaZSLuq8Cw0GA" memberEnd="_DN55vcN3EeaZSLuq8Cw0GA _DN55x8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN55x8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN55ucN3EeaZSLuq8Cw0GA" association="_DN55xsN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wokszGREee_69jl7_GsIw" memberEnd="_5wokmDGREee_69jl7_GsIw _5woktDGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5woktDGREee_69jl7_GsIw" visibility="public" type="_5wokkjGREee_69jl7_GsIw" association="_5wokszGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN55yMN3EeaZSLuq8Cw0GA" name="DataID">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN55ycN3EeaZSLuq8Cw0GA">
-          <body>The Data Identification object (DataID) stores the dataset identifiers and other metadata typically assigned by the dataset creator.
-	The Dataset IDs in this object must comply with the syntax for dataset identifiers defined in the "IVOA Identifiers" document, including the use of 'stop' characters to identify specific datasets that are not individually in the registry.   e.g., ivo://example.net/aservice?2013/5/2342.
-	Much of the content of this object is assembled from various definitions in the IVAO Resource Metadata document.  Here, we provide a brief description of each field for easy reference, along with a notation of its mapping to the Resource Metadata document (RM:field), where the reader may find more detailed information.
-</body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55ysN3EeaZSLuq8Cw0GA" name="creator" visibility="public" type="_DN56TMN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN555sN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55y8N3EeaZSLuq8Cw0GA">
-            <body>The institution or entity which created the dataset.</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55zMN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55zcN3EeaZSLuq8Cw0GA" name="contributor" visibility="public" type="_DN56T8N3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN556MN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55zsN3EeaZSLuq8Cw0GA">
-            <body>Persons or entities who contributed to the generation of the scientific content of the dataset.  Users of the dataset should include these in subsequent credits and acknowledgements. (RM:Curation.Contributor)</body>
-          </ownedComment>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN55z8N3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN550MN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN550cN3EeaZSLuq8Cw0GA" name="collection" visibility="public" type="_DN56WMN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN556sN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN550sN3EeaZSLuq8Cw0GA">
-            <body>The dataset is associated with zero or more Collections (instrument name, survey name, etc.) .  Each instance identifies a tag indicating some degree of compatibility with other data sharing the same Collection properties.</body>
-          </ownedComment>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN5508N3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN551MN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN551cN3EeaZSLuq8Cw0GA" name="title" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN551sN3EeaZSLuq8Cw0GA">
-            <body>A free form string giving a title for the dataset.  (RM:Identity.Title)</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5518N3EeaZSLuq8Cw0GA" name="datasetID" visibility="public" type="_DN5STsN3EeaZSLuq8Cw0GA" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN552MN3EeaZSLuq8Cw0GA">
-            <body>If the dataset is registered with an external 'global index service' such as ADS, the publisher may include that identifier here.  This provides a common, persistent identifier for the dataset, and possible access point to follow for information on publications and other related datasets.  Note: the same dataset published at more than one location would have different Curation.publisherDID values, but the same DataID.datasetID.  eg: "ivo://ADS/Sa.CXO?obsid=1234", "ivo://ADS/sh.hut#ngc4151_141"
-</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN552cN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN552sN3EeaZSLuq8Cw0GA" name="creatorDID" visibility="public" type="_DN5STsN3EeaZSLuq8Cw0GA" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN5528N3EeaZSLuq8Cw0GA">
-            <body>The dataset identifier assigned by the creator.  Here, the authority-id of the identifier must be that of the creator.  It is used to identify the original exposure of the dataset in an archive, and will remain static regardless of where the dataset is published.  The creator ID will not necessarily change even if the VO object in question is a cutout or is otherwise further processed.
-</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN553MN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN553cN3EeaZSLuq8Cw0GA" name="version" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN553sN3EeaZSLuq8Cw0GA">
-            <body>Version assigned by the creator, reflecting the production version of the dataset.  This value should only be changed by the creator, upon the new release of a dataset.  There are no format restrictions or specifications on the versioning scheme.
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN5538N3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN554MN3EeaZSLuq8Cw0GA" name="date" visibility="public" type="_DN5STcN3EeaZSLuq8Cw0GA" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN554cN3EeaZSLuq8Cw0GA">
-            <body>Data processing or creation date (RM:Curation.Date).</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN554sN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5548N3EeaZSLuq8Cw0GA" name="creationType" visibility="public" type="_DN56HMN3EeaZSLuq8Cw0GA" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN555MN3EeaZSLuq8Cw0GA">
-            <body>The dataset creation type describes the nature or genre of the content.  (RM:General.Type).
-Note: This field provides information about the process by which the dataset was created.  As the Observation/Experiment model matures, this may evolve into a provenance element on the Experiment type.</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN555cN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5woktTGREee_69jl7_GsIw" name="WasInformedBy" memberEnd="_5wokmzGREee_69jl7_GsIw _5woktjGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5woktjGREee_69jl7_GsIw" name="wasInformedBy" visibility="public" type="_5wokkjGREee_69jl7_GsIw" association="_5woktTGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN555sN3EeaZSLuq8Cw0GA" memberEnd="_DN55ysN3EeaZSLuq8Cw0GA _DN5558N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN5558N3EeaZSLuq8Cw0GA" visibility="public" type="_DN55yMN3EeaZSLuq8Cw0GA" association="_DN555sN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5woktzGREee_69jl7_GsIw" memberEnd="_5woknjGREee_69jl7_GsIw _5wokuDGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wokuDGREee_69jl7_GsIw" visibility="public" type="_5wokkjGREee_69jl7_GsIw" association="_5woktzGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN556MN3EeaZSLuq8Cw0GA" memberEnd="_DN55zcN3EeaZSLuq8Cw0GA _DN556cN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN556cN3EeaZSLuq8Cw0GA" visibility="public" type="_DN55yMN3EeaZSLuq8Cw0GA" association="_DN556MN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wokuTGREee_69jl7_GsIw" memberEnd="_5wokoTGREee_69jl7_GsIw _5wokujGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wokujGREee_69jl7_GsIw" visibility="public" type="_5wokkjGREee_69jl7_GsIw" association="_5wokuTGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN556sN3EeaZSLuq8Cw0GA" memberEnd="_DN550cN3EeaZSLuq8Cw0GA _DN5568N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN5568N3EeaZSLuq8Cw0GA" visibility="public" type="_DN55yMN3EeaZSLuq8Cw0GA" association="_DN556sN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN557MN3EeaZSLuq8Cw0GA" name="Curation">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN557cN3EeaZSLuq8Cw0GA">
-          <body>The Curation object provides metadata assigned by the entity responsible for the support of the dataset content as well as identifying metadata about that entity.  It is assembled from definitions provided by the IVOA standard document, "Resource Metadata for the Virtual Observatory; Version 1.12"  (Resource Metadata).  Here, we provide a brief description of each field for easy reference, along with a notation of its mapping to the Resource Metadata document (RM:field), where the reader may find more detailed information.
-</body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN557sN3EeaZSLuq8Cw0GA" name="publisher" visibility="public" type="_DN56QcN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN56AsN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN5578N3EeaZSLuq8Cw0GA">
-            <body>The entity making the data available.  (RM:Curation.Publisher)</body>
-          </ownedComment>
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wokuzGREee_69jl7_GsIw" name="ActivityDescription">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokvDGREee_69jl7_GsIw" name="usedDescription" visibility="public" type="_5wolYDGREee_69jl7_GsIw" aggregation="composite" association="_5wok0TGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wokvTGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wokvjGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN558MN3EeaZSLuq8Cw0GA" name="contact" visibility="public" type="_DN56R8N3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN56BMN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN558cN3EeaZSLuq8Cw0GA">
-            <body>Contact information of the person/entity responsible for the content of the dataset.  We recommend using a generic 'helpdesk' type contact rather than individuals whose information may more easily become obsolete. (RM:Curation.Contact)</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN558sN3EeaZSLuq8Cw0GA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokvzGREee_69jl7_GsIw" name="wasGeneratedByDescription" visibility="public" type="_5wolHDGREee_69jl7_GsIw" aggregation="composite" association="_5wok0zGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wokwDGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wokwTGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5588N3EeaZSLuq8Cw0GA" name="reference" visibility="public" type="_DN56VMN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN56BsN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN559MN3EeaZSLuq8Cw0GA">
-            <body>Zero or more bibliographic or documentation references associated with the dataset.  Each instance provides a single forward link to a major publication which references the dataset.  (RM:General.Source)</body>
-          </ownedComment>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN559cN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN559sN3EeaZSLuq8Cw0GA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokwjGREee_69jl7_GsIw" name="parameterDescription" visibility="public" type="_5wolVzGREee_69jl7_GsIw" aggregation="composite" association="_5wok1TGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wokwzGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wokxDGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5598N3EeaZSLuq8Cw0GA" name="publisherDID" visibility="public" type="_DN5STsN3EeaZSLuq8Cw0GA" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55-MN3EeaZSLuq8Cw0GA">
-            <body>IVOA dataset identifier assigned by the publisher to uniquely identify the dataset within its holdings.  Typically, the basis of this identifier will be the publisher ID.  However, if the publisherchooses to use a 'global index service' such as ADS to obtain persistent identifiers for their datasets, rather than generate their own, that identifier should be used both here and for DataID.datasetID.  Note: this model also defines a creator dataset ID (DataID.creatorDID), these will differ if the publishing entity is not the creator of the dataset.  Values are to be expressed as dataset identifiers using the syntax described in "IVOA Identifiers"</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55-cN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55-sN3EeaZSLuq8Cw0GA" name="version" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55-8N3EeaZSLuq8Cw0GA">
-            <body>Version of the curated dataset, assigned by the publisher.  This is an independent versioning from DataID.version that allows the publisher to track changes to the high level dataset metadata (e.g. curation metadata, identifiers, etc.) without effecting the creator defined dataset version.  The value may be based on the DataID.version (e.g. by adding a sub-version extension), or an independent versioning.  There are no format restrictions on the value.  (RM:Curation.Version)
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55_MN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN55_cN3EeaZSLuq8Cw0GA" name="releaseDate" visibility="public" type="_DN5STcN3EeaZSLuq8Cw0GA" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN55_sN3EeaZSLuq8Cw0GA">
-            <body>Date the curated dataset was last modified.  (RM:Curation.Date)</body>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokxTGREee_69jl7_GsIw" name="id" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokxjGREee_69jl7_GsIw" name="name" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5wokxzGREee_69jl7_GsIw">
+            <body><Enter note text here></body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN55_8N3EeaZSLuq8Cw0GA"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wokyDGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56AMN3EeaZSLuq8Cw0GA" name="rights" visibility="public" type="_DN56KsN3EeaZSLuq8Cw0GA" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56AcN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN56AsN3EeaZSLuq8Cw0GA" memberEnd="_DN557sN3EeaZSLuq8Cw0GA _DN56A8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN56A8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN557MN3EeaZSLuq8Cw0GA" association="_DN56AsN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN56BMN3EeaZSLuq8Cw0GA" memberEnd="_DN558MN3EeaZSLuq8Cw0GA _DN56BcN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN56BcN3EeaZSLuq8Cw0GA" visibility="public" type="_DN557MN3EeaZSLuq8Cw0GA" association="_DN56BMN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN56BsN3EeaZSLuq8Cw0GA" memberEnd="_DN5588N3EeaZSLuq8Cw0GA _DN56B8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN56B8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN557MN3EeaZSLuq8Cw0GA" association="_DN56BsN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_DN56CMN3EeaZSLuq8Cw0GA" name="DataProductType">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN56CcN3EeaZSLuq8Cw0GA">
-          <body>Enumeration identifying the high level classification of a data product.</body>
-        </ownedComment>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56CsN3EeaZSLuq8Cw0GA" name="CUBE">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56C8N3EeaZSLuq8Cw0GA">
-            <body>A multidimensional astronomical image of three (3) or more axes.
-</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56DMN3EeaZSLuq8Cw0GA" name="IMAGE">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56DcN3EeaZSLuq8Cw0GA">
-            <body>A two (2) dimensional astronomical image.</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56DsN3EeaZSLuq8Cw0GA" name="PHOTOMETRY">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56D8N3EeaZSLuq8Cw0GA">
-            <body>Dataset with spectral coverage with irregular gaps.
-</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56EMN3EeaZSLuq8Cw0GA" name="SPECTRUM">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56EcN3EeaZSLuq8Cw0GA">
-            <body>Dataset where spectral coverage is the primary attribute, in contiguous bins. e.g. a 1D spectrum or a long slit spectrum.
-</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56EsN3EeaZSLuq8Cw0GA" name="TIMESERIES">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56E8N3EeaZSLuq8Cw0GA">
-            <body>Dataset presenting some quantity varying as a function of time.  A light curve is a typical example of a timeseries dataset.</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56FMN3EeaZSLuq8Cw0GA" name="SED">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56FcN3EeaZSLuq8Cw0GA">
-            <body>A spectral energy distribution, an advanced data product often produced by combining data from multiple observations.</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56FsN3EeaZSLuq8Cw0GA" name="VISIBILITY">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56F8N3EeaZSLuq8Cw0GA">
-            <body>A visibility (radio) dataset. Typically this is instrumental data, and is often a complex object containing multiple files or other substructures.  A visibility dataset may contain data with spatial, spectral, time, and polarization information for each measured visibility.</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56GMN3EeaZSLuq8Cw0GA" name="EVENT">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56GcN3EeaZSLuq8Cw0GA">
-            <body>An event counting dataset (e.g. X-ray). An event dataset may contain data with spatial, spectral, and time information for each measured event. </body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56GsN3EeaZSLuq8Cw0GA" name="CATALOG">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56G8N3EeaZSLuq8Cw0GA">
-            <body>A catalog.
-</body>
-          </ownedComment>
-        </ownedLiteral>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_DN56HMN3EeaZSLuq8Cw0GA" name="CreationType">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN56HcN3EeaZSLuq8Cw0GA">
-          <body>Enumeration of dataset creation types.</body>
-        </ownedComment>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56HsN3EeaZSLuq8Cw0GA" name="ARCHIVAL">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56H8N3EeaZSLuq8Cw0GA">
-            <body>Indicates that it is one of a collection of datasets generated in a systematic, homogeneous way and is stored statically (or at least versioned).  It will be possible to regenerate this dataset at a later date.  The remaining types imply on-the-fly manipulation.</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56IMN3EeaZSLuq8Cw0GA" name="CUTOUT">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56IcN3EeaZSLuq8Cw0GA">
-            <body>Indicates that the dataset was created "on-the-fly", by subsetting, but not by modifying values.
-</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56IsN3EeaZSLuq8Cw0GA" name="FILTERED">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56I8N3EeaZSLuq8Cw0GA">
-            <body>May involve excluding data prior to binning into samples, also "on-the-fly"
-</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56JMN3EeaZSLuq8Cw0GA" name="MOSAIC">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56JcN3EeaZSLuq8Cw0GA">
-            <body>Combines multiple original datasets "on-the-fly"</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56JsN3EeaZSLuq8Cw0GA" name="SPECTRAL_EXTRACTION">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56J8N3EeaZSLuq8Cw0GA">
-            <body>Has been extracted, for example, from a spectral data cube.
-</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56KMN3EeaZSLuq8Cw0GA" name="CATALOG_EXTRACTION">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56KcN3EeaZSLuq8Cw0GA">
-            <body>Has been extracted from a catalog.</body>
-          </ownedComment>
-        </ownedLiteral>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_DN56KsN3EeaZSLuq8Cw0GA" name="RightsType">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN56K8N3EeaZSLuq8Cw0GA">
-          <body>Enumeration of access rights levels.
-</body>
-        </ownedComment>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56LMN3EeaZSLuq8Cw0GA" name="PUBLIC">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56LcN3EeaZSLuq8Cw0GA">
-            <body>unrestricted, public access is allowed, without authentication.</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56LsN3EeaZSLuq8Cw0GA" name="PROPRIETARY">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56L8N3EeaZSLuq8Cw0GA">
-            <body>only proprietary access is allowed with authentication. 
-</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56MMN3EeaZSLuq8Cw0GA" name="SECURE">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56McN3EeaZSLuq8Cw0GA">
-            <body>authenticated, public access is allowed.</body>
-          </ownedComment>
-        </ownedLiteral>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_DN56MsN3EeaZSLuq8Cw0GA" name="SpectralBandType">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56M8N3EeaZSLuq8Cw0GA" name="RADIO">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56NMN3EeaZSLuq8Cw0GA">
-            <body>λ ≥ 10 mm; ν ≤ 30 GHz</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56NcN3EeaZSLuq8Cw0GA" name="MILLIMETER">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56NsN3EeaZSLuq8Cw0GA">
-            <body>0.1 mm ≤ λ ≤ 10 mm; 3000 GHz ≥ ν ≥ 30 GHz
-</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56N8N3EeaZSLuq8Cw0GA" name="INFRARED">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56OMN3EeaZSLuq8Cw0GA">
-            <body>1 μ ≤ λ ≤ 100 μ</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56OcN3EeaZSLuq8Cw0GA" name="OPTICAL">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56OsN3EeaZSLuq8Cw0GA">
-            <body>0.3 μ ≤ λ ≤ 1 μ
-</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56O8N3EeaZSLuq8Cw0GA" name="ULTRAVIOLET">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56PMN3EeaZSLuq8Cw0GA">
-            <body>100 Å ≤ λ ≤ 3000 Å; 1.2 eV ≤ E ≤ 120 eV
-</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56PcN3EeaZSLuq8Cw0GA" name="XRAY">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56PsN3EeaZSLuq8Cw0GA">
-            <body>0.1 Å ≤ λ ≤ 100 Å; 0.12 keV ≤ E ≤ 120 keV
-</body>
-          </ownedComment>
-        </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN56P8N3EeaZSLuq8Cw0GA" name="GAMMARAY">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56QMN3EeaZSLuq8Cw0GA">
-            <body>E ≥ 120keV</body>
-          </ownedComment>
-        </ownedLiteral>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN56QcN3EeaZSLuq8Cw0GA" name="Publisher">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN56QsN3EeaZSLuq8Cw0GA">
-          <body>Publisher is modeled as a Role played by the organization or entity making the Dataset available.</body>
-        </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN56Q8N3EeaZSLuq8Cw0GA" general="_DN56asN3EeaZSLuq8Cw0GA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56RMN3EeaZSLuq8Cw0GA" name="publisherID" visibility="public" type="_DN5STsN3EeaZSLuq8Cw0GA" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56RcN3EeaZSLuq8Cw0GA">
-            <body>IVOA resource identifier associated with the publisher and registered with an IVOA compliant registry  (eg: ivo://mast.stsci.edu).  Values are to be expressed using the syntax described in "IVOA Identifiers".
-</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56RsN3EeaZSLuq8Cw0GA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokyTGREee_69jl7_GsIw" name="type" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wokyjGREee_69jl7_GsIw"/>
         </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN56R8N3EeaZSLuq8Cw0GA" name="Contact">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN56SMN3EeaZSLuq8Cw0GA">
-          <body>Contact information for a person or entity.
-
-Contact is modeled as a Role played by a particular person or entity (Party).  We subset the type of Party to include only Individuals.  This includes both a physical person, or proxy service such as a helpdesk.
-</body>
-        </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN56ScN3EeaZSLuq8Cw0GA" general="_DN56asN3EeaZSLuq8Cw0GA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56SsN3EeaZSLuq8Cw0GA" name="party" visibility="public" type="_DN56ccN3EeaZSLuq8Cw0GA" association="_DN56Y8N3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56S8N3EeaZSLuq8Cw0GA">
-            <body>Reference to the Individual associated with this role.</body>
-          </ownedComment>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokyzGREee_69jl7_GsIw" name="subtype" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wokzDGREee_69jl7_GsIw"/>
         </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN56TMN3EeaZSLuq8Cw0GA" name="Creator">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN56TcN3EeaZSLuq8Cw0GA">
-          <body>Creator is modeled as a Role played by the organization or entity which created the Dataset.
-</body>
-        </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN56TsN3EeaZSLuq8Cw0GA" general="_DN56asN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN56T8N3EeaZSLuq8Cw0GA" name="Contributor">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN56UMN3EeaZSLuq8Cw0GA">
-          <body>Contributor is modeled as a Role played by a Party or entity who participated in the generation of the Dataset.</body>
-        </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN56UcN3EeaZSLuq8Cw0GA" general="_DN56asN3EeaZSLuq8Cw0GA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56UsN3EeaZSLuq8Cw0GA" name="acknowledgment" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56U8N3EeaZSLuq8Cw0GA">
-            <body>Acknowledgment expression for the contributor.  Users of the dataset should include these in subsequent credits and acknowledgements.  The expression should be formatted as desired by the contributor.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokzTGREee_69jl7_GsIw" name="description" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wokzjGREee_69jl7_GsIw"/>
         </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN56VMN3EeaZSLuq8Cw0GA" name="Publication">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN56VcN3EeaZSLuq8Cw0GA">
-          <body>Any referenceable publication associated with a Dataset.</body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56VsN3EeaZSLuq8Cw0GA" name="refCode" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56V8N3EeaZSLuq8Cw0GA">
-            <body>Reference code of the publication.  Values should be expressed as a URL, or bibcode (discernible as a 19 character string beginning with 4 digits).  Free text references are allowed, but discouraged.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wokzzGREee_69jl7_GsIw" name="doculink" visibility="public" type="_5wokejGREee_69jl7_GsIw" isUnique="false">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wok0DGREee_69jl7_GsIw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN56WMN3EeaZSLuq8Cw0GA" name="Collection">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN56WcN3EeaZSLuq8Cw0GA">
-          <body>A generic organizational construct which allows Datasets to be associated with each other by a set of Collection properties.  Datasets tagged with the same Collection properies can be assumed to have some degree of compatibility.</body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56WsN3EeaZSLuq8Cw0GA" name="name" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56W8N3EeaZSLuq8Cw0GA">
-            <body>The values are generally defined by the creating entity.  Examples: "WFC", "Sloan", "BFS Spectrograph", "MSX Galactic Plane Survey".
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-        </ownedAttribute>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wok0TGREee_69jl7_GsIw" memberEnd="_5wokvDGREee_69jl7_GsIw _5wok0jGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wok0jGREee_69jl7_GsIw" visibility="public" type="_5wokuzGREee_69jl7_GsIw" association="_5wok0TGREee_69jl7_GsIw"/>
       </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:InformationItem" xmi:id="_DN56XMN3EeaZSLuq8Cw0GA" name="Dataset Metadata model with straw-man Observation model and prototype STC2."/>
-    <packagedElement xmi:type="uml:InformationItem" xmi:id="_DN56XcN3EeaZSLuq8Cw0GA" name="Dataset Metadata V1.0 (2016)"/>
-    <packagedElement xmi:type="uml:Package" xmi:id="_DN56XsN3EeaZSLuq8Cw0GA" name="party">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_DN56X8N3EeaZSLuq8Cw0GA">
-        <body>We include a simple Party model for associating an Entity with a Role that Entity is playing.  For example, a particular Individual can be both a Contact and Publisher of a dataset.</body>
-      </ownedComment>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN56YMN3EeaZSLuq8Cw0GA" memberEnd="_DN55a8N3EeaZSLuq8Cw0GA _DN56YcN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN56YcN3EeaZSLuq8Cw0GA" visibility="public" type="_DN55aMN3EeaZSLuq8Cw0GA" association="_DN56YMN3EeaZSLuq8Cw0GA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56YsN3EeaZSLuq8Cw0GA"/>
-        </ownedEnd>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wok0zGREee_69jl7_GsIw" memberEnd="_5wokvzGREee_69jl7_GsIw _5wok1DGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wok1DGREee_69jl7_GsIw" visibility="public" type="_5wokuzGREee_69jl7_GsIw" association="_5wok0zGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN56Y8N3EeaZSLuq8Cw0GA" memberEnd="_DN56SsN3EeaZSLuq8Cw0GA _DN56ZMN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN56ZMN3EeaZSLuq8Cw0GA" visibility="public" type="_DN56R8N3EeaZSLuq8Cw0GA" association="_DN56Y8N3EeaZSLuq8Cw0GA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56ZcN3EeaZSLuq8Cw0GA"/>
-        </ownedEnd>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wok1TGREee_69jl7_GsIw" memberEnd="_5wokwjGREee_69jl7_GsIw _5wok1jGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wok1jGREee_69jl7_GsIw" visibility="public" type="_5wokuzGREee_69jl7_GsIw" association="_5wok1TGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN56ZsN3EeaZSLuq8Cw0GA" name="Party" isAbstract="true">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN56Z8N3EeaZSLuq8Cw0GA">
-          <body>Abstract head of the set of classes describing various entities. </body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56aMN3EeaZSLuq8Cw0GA" name="name" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56acN3EeaZSLuq8Cw0GA">
-            <body>Name of the Party or entity.  All entities are assumed to have a name.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wok1zGREee_69jl7_GsIw" name="Entity">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wok2DGREee_69jl7_GsIw" name="entityDescription" visibility="public" type="_5wok-zGREee_69jl7_GsIw" association="_5wok7zGREee_69jl7_GsIw">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wok2TGREee_69jl7_GsIw"/>
         </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN56asN3EeaZSLuq8Cw0GA" name="Role" isAbstract="true">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN56a8N3EeaZSLuq8Cw0GA">
-          <body>Abstract class for the entity role.  Models should extend this class to define local roles which are played by various entities/parties.</body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56bMN3EeaZSLuq8Cw0GA" name="party" visibility="public" type="_DN56ZsN3EeaZSLuq8Cw0GA" association="_DN56bsN3EeaZSLuq8Cw0GA">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56bcN3EeaZSLuq8Cw0GA">
-            <body>Reference to the Party or Entity which is associated with this role.</body>
-          </ownedComment>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wok2jGREee_69jl7_GsIw" name="wasGeneratedBy" visibility="public" type="_5wolFDGREee_69jl7_GsIw" aggregation="composite" association="_5wok8zGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wok2zGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wok3DGREee_69jl7_GsIw"/>
         </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN56bsN3EeaZSLuq8Cw0GA" memberEnd="_DN56bMN3EeaZSLuq8Cw0GA _DN56b8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN56b8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN56asN3EeaZSLuq8Cw0GA" association="_DN56bsN3EeaZSLuq8Cw0GA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56cMN3EeaZSLuq8Cw0GA"/>
-        </ownedEnd>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN56ccN3EeaZSLuq8Cw0GA" name="Individual">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN56csN3EeaZSLuq8Cw0GA">
-          <body>Abstract head of the sub-set of Parties which describe a single individual.</body>
-        </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN56c8N3EeaZSLuq8Cw0GA" general="_DN56ZsN3EeaZSLuq8Cw0GA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56dMN3EeaZSLuq8Cw0GA" name="address" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56dcN3EeaZSLuq8Cw0GA">
-            <body>Mailing address for the person.  The value is expressed as a single string containing all components of the address. </body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56dsN3EeaZSLuq8Cw0GA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wok3TGREee_69jl7_GsIw" name="used" visibility="public" type="_5wolDDGREee_69jl7_GsIw" aggregation="composite" association="_5wok9TGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wok3jGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wok3zGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56d8N3EeaZSLuq8Cw0GA" name="phone" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56eMN3EeaZSLuq8Cw0GA">
-            <body>Phone number associated with the person.  The value is expressed as a string according to the format appropriate for the locale.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56ecN3EeaZSLuq8Cw0GA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wok4DGREee_69jl7_GsIw" name="progenitor" visibility="public" type="_5wok1zGREee_69jl7_GsIw" association="_5wok9zGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wok4TGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wok4jGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56esN3EeaZSLuq8Cw0GA" name="email" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56e8N3EeaZSLuq8Cw0GA">
-            <body>E-mail address of the Individual</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56fMN3EeaZSLuq8Cw0GA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wok4zGREee_69jl7_GsIw" name="wasAttributedTo" visibility="public" type="_5wolLTGREee_69jl7_GsIw" aggregation="composite" association="_5wok-TGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wok5DGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wok5TGREee_69jl7_GsIw"/>
         </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN56fcN3EeaZSLuq8Cw0GA" name="Organization">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DN56fsN3EeaZSLuq8Cw0GA">
-          <body>Extension of Party for any Organization or Institution.</body>
-        </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN56f8N3EeaZSLuq8Cw0GA" general="_DN56ZsN3EeaZSLuq8Cw0GA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56gMN3EeaZSLuq8Cw0GA" name="address" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56gcN3EeaZSLuq8Cw0GA">
-            <body>Mailing address.  The value is expressed as a single string containing all components of the address. 
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56gsN3EeaZSLuq8Cw0GA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wok5jGREee_69jl7_GsIw" name="id" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wok5zGREee_69jl7_GsIw" name="name" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wok6DGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56g8N3EeaZSLuq8Cw0GA" name="phone" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56hMN3EeaZSLuq8Cw0GA">
-            <body>Phone number.  The value is expressed as a string according to the format appropriate for the locale.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56hcN3EeaZSLuq8Cw0GA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wok6TGREee_69jl7_GsIw" name="type" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wok6jGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56hsN3EeaZSLuq8Cw0GA" name="email" visibility="public" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56h8N3EeaZSLuq8Cw0GA">
-            <body>E-mail address of the Organization.
-</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56iMN3EeaZSLuq8Cw0GA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wok6zGREee_69jl7_GsIw" name="annotation" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wok7DGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56icN3EeaZSLuq8Cw0GA" name="logo" visibility="public" type="_DN5STsN3EeaZSLuq8Cw0GA" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN56isN3EeaZSLuq8Cw0GA">
-            <body>URL pointer to a graphical logo associated with the Organization.</body>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wok7TGREee_69jl7_GsIw" name="rights" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5wok7jGREee_69jl7_GsIw">
+            <body><Enter note text here></body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56i8N3EeaZSLuq8Cw0GA"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN56jMN3EeaZSLuq8Cw0GA" memberEnd="_DN57IMN3EeaZSLuq8Cw0GA _DN56jcN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN56jcN3EeaZSLuq8Cw0GA" visibility="public" type="_DN57H8N3EeaZSLuq8Cw0GA" association="_DN56jMN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_DN56jsN3EeaZSLuq8Cw0GA" name="provenance">
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN56j8N3EeaZSLuq8Cw0GA" name="Activity">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56kMN3EeaZSLuq8Cw0GA" name="activityDescription" visibility="public" type="_DN56tsN3EeaZSLuq8Cw0GA" association="_DN56qMN3EeaZSLuq8Cw0GA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56kcN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56ksN3EeaZSLuq8Cw0GA" name="wasGeneratedBy" visibility="public" type="_DN57FsN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN56rMN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN56k8N3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56lMN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56lcN3EeaZSLuq8Cw0GA" name="used" visibility="public" type="_DN57D8N3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN56rsN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN56lsN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56l8N3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56mMN3EeaZSLuq8Cw0GA" name="activity" visibility="public" type="_DN56j8N3EeaZSLuq8Cw0GA" association="_DN56sMN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN56mcN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56msN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56m8N3EeaZSLuq8Cw0GA" name="wasAssociatedWith" visibility="public" type="_DN57LsN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN56ssN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN56nMN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56ncN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56nsN3EeaZSLuq8Cw0GA" name="parameter" visibility="public" type="_DN6ghMN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN56tMN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN56n8N3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56oMN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56ocN3EeaZSLuq8Cw0GA" name="id" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56osN3EeaZSLuq8Cw0GA" name="label" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56o8N3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56pMN3EeaZSLuq8Cw0GA" name="startTime" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56pcN3EeaZSLuq8Cw0GA" name="endTime" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56psN3EeaZSLuq8Cw0GA" name="annotation" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56p8N3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN56qMN3EeaZSLuq8Cw0GA" memberEnd="_DN56kMN3EeaZSLuq8Cw0GA _DN56qcN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN56qcN3EeaZSLuq8Cw0GA" visibility="public" type="_DN56j8N3EeaZSLuq8Cw0GA" association="_DN56qMN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN56qsN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56q8N3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wok7zGREee_69jl7_GsIw" memberEnd="_5wok2DGREee_69jl7_GsIw _5wok8DGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wok8DGREee_69jl7_GsIw" visibility="public" type="_5wok1zGREee_69jl7_GsIw" association="_5wok7zGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wok8TGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wok8jGREee_69jl7_GsIw"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN56rMN3EeaZSLuq8Cw0GA" memberEnd="_DN56ksN3EeaZSLuq8Cw0GA _DN56rcN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN56rcN3EeaZSLuq8Cw0GA" visibility="public" type="_DN56j8N3EeaZSLuq8Cw0GA" association="_DN56rMN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN56rsN3EeaZSLuq8Cw0GA" memberEnd="_DN56lcN3EeaZSLuq8Cw0GA _DN56r8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN56r8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN56j8N3EeaZSLuq8Cw0GA" association="_DN56rsN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wok8zGREee_69jl7_GsIw" memberEnd="_5wok2jGREee_69jl7_GsIw _5wok9DGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wok9DGREee_69jl7_GsIw" visibility="public" type="_5wok1zGREee_69jl7_GsIw" association="_5wok8zGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN56sMN3EeaZSLuq8Cw0GA" name="WasInformedBy" memberEnd="_DN56mMN3EeaZSLuq8Cw0GA _DN56scN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN56scN3EeaZSLuq8Cw0GA" name="wasInformedBy" visibility="public" type="_DN56j8N3EeaZSLuq8Cw0GA" association="_DN56sMN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wok9TGREee_69jl7_GsIw" memberEnd="_5wok3TGREee_69jl7_GsIw _5wok9jGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wok9jGREee_69jl7_GsIw" visibility="public" type="_5wok1zGREee_69jl7_GsIw" association="_5wok9TGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN56ssN3EeaZSLuq8Cw0GA" memberEnd="_DN56m8N3EeaZSLuq8Cw0GA _DN56s8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN56s8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN56j8N3EeaZSLuq8Cw0GA" association="_DN56ssN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wok9zGREee_69jl7_GsIw" name="WasDerivedFrom" memberEnd="_5wok4DGREee_69jl7_GsIw _5wok-DGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wok-DGREee_69jl7_GsIw" visibility="public" type="_5wok1zGREee_69jl7_GsIw" association="_5wok9zGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN56tMN3EeaZSLuq8Cw0GA" memberEnd="_DN56nsN3EeaZSLuq8Cw0GA _DN56tcN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN56tcN3EeaZSLuq8Cw0GA" visibility="public" type="_DN56j8N3EeaZSLuq8Cw0GA" association="_DN56tMN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wok-TGREee_69jl7_GsIw" memberEnd="_5wok4zGREee_69jl7_GsIw _5wok-jGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wok-jGREee_69jl7_GsIw" visibility="public" type="_5wok1zGREee_69jl7_GsIw" association="_5wok-TGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN56tsN3EeaZSLuq8Cw0GA" name="ActivityDescription">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56t8N3EeaZSLuq8Cw0GA" name="usedDescription" visibility="public" type="_DN6glMN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN56y8N3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN56uMN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56ucN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56usN3EeaZSLuq8Cw0GA" name="wasGeneratedByDescription" visibility="public" type="_DN57HcN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN56zcN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN56u8N3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56vMN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56vcN3EeaZSLuq8Cw0GA" name="parameterDescription" visibility="public" type="_DN6gi8N3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN56z8N3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN56vsN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56v8N3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56wMN3EeaZSLuq8Cw0GA" name="id" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56wcN3EeaZSLuq8Cw0GA" name="label" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56wsN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56w8N3EeaZSLuq8Cw0GA" name="type" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56xMN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wok-zGREee_69jl7_GsIw" name="EntityDescription">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wok_DGREee_69jl7_GsIw" name="wasGeneratedByDescription" visibility="public" type="_5wolHDGREee_69jl7_GsIw" aggregation="composite" association="_5wolCDGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wok_TGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wok_jGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56xcN3EeaZSLuq8Cw0GA" name="subtype" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56xsN3EeaZSLuq8Cw0GA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wok_zGREee_69jl7_GsIw" name="usedDescription" visibility="public" type="_5wolYDGREee_69jl7_GsIw" aggregation="composite" association="_5wolCjGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wolADGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wolATGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56x8N3EeaZSLuq8Cw0GA" name="description" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56yMN3EeaZSLuq8Cw0GA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolAjGREee_69jl7_GsIw" name="id" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolAzGREee_69jl7_GsIw" name="name" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolBDGREee_69jl7_GsIw" name="annotation" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolBTGREee_69jl7_GsIw" name="category" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolBjGREee_69jl7_GsIw" name="doculink" visibility="public" type="_5wokejGREee_69jl7_GsIw" isUnique="false">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wolBzGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56ycN3EeaZSLuq8Cw0GA" name="docuLink" visibility="public" type="_DN5STsN3EeaZSLuq8Cw0GA" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56ysN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN56y8N3EeaZSLuq8Cw0GA" memberEnd="_DN56t8N3EeaZSLuq8Cw0GA _DN56zMN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN56zMN3EeaZSLuq8Cw0GA" visibility="public" type="_DN56tsN3EeaZSLuq8Cw0GA" association="_DN56y8N3EeaZSLuq8Cw0GA"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN56zcN3EeaZSLuq8Cw0GA" memberEnd="_DN56usN3EeaZSLuq8Cw0GA _DN56zsN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN56zsN3EeaZSLuq8Cw0GA" visibility="public" type="_DN56tsN3EeaZSLuq8Cw0GA" association="_DN56zcN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wolCDGREee_69jl7_GsIw" memberEnd="_5wok_DGREee_69jl7_GsIw _5wolCTGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wolCTGREee_69jl7_GsIw" visibility="public" type="_5wok-zGREee_69jl7_GsIw" association="_5wolCDGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN56z8N3EeaZSLuq8Cw0GA" memberEnd="_DN56vcN3EeaZSLuq8Cw0GA _DN560MN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN560MN3EeaZSLuq8Cw0GA" visibility="public" type="_DN56tsN3EeaZSLuq8Cw0GA" association="_DN56z8N3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wolCjGREee_69jl7_GsIw" memberEnd="_5wok_zGREee_69jl7_GsIw _5wolCzGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wolCzGREee_69jl7_GsIw" visibility="public" type="_5wok-zGREee_69jl7_GsIw" association="_5wolCjGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN560cN3EeaZSLuq8Cw0GA" name="Entity">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN560sN3EeaZSLuq8Cw0GA" name="entityDescription" visibility="public" type="_DN5698N3EeaZSLuq8Cw0GA" association="_DN566MN3EeaZSLuq8Cw0GA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN5608N3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN561MN3EeaZSLuq8Cw0GA" name="wasGeneratedBy" visibility="public" type="_DN57FsN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN567MN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN561cN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN561sN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5618N3EeaZSLuq8Cw0GA" name="used" visibility="public" type="_DN57D8N3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN567sN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN562MN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN562cN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN562sN3EeaZSLuq8Cw0GA" name="progenitor" visibility="public" type="_DN560cN3EeaZSLuq8Cw0GA" association="_DN568MN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN5628N3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN563MN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wolDDGREee_69jl7_GsIw" name="Used">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolDTGREee_69jl7_GsIw" name="usedDescription" visibility="public" type="_5wolYDGREee_69jl7_GsIw" association="_5wolEDGREee_69jl7_GsIw">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wolDjGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN563cN3EeaZSLuq8Cw0GA" name="wasAttributedTo" visibility="public" type="_DN6gYMN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN568sN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN563sN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN5638N3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN564MN3EeaZSLuq8Cw0GA" name="id" visibility="public" clientDependency="_DN569MN3EeaZSLuq8Cw0GA" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN564cN3EeaZSLuq8Cw0GA" name="label" visibility="public" clientDependency="_DN569cN3EeaZSLuq8Cw0GA" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN564sN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5648N3EeaZSLuq8Cw0GA" name="type" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN565MN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN565cN3EeaZSLuq8Cw0GA" name="annotation" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN565sN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN5658N3EeaZSLuq8Cw0GA" name="access" visibility="public" clientDependency="_DN569sN3EeaZSLuq8Cw0GA" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolDzGREee_69jl7_GsIw" name="role" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN566MN3EeaZSLuq8Cw0GA" memberEnd="_DN560sN3EeaZSLuq8Cw0GA _DN566cN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN566cN3EeaZSLuq8Cw0GA" visibility="public" type="_DN560cN3EeaZSLuq8Cw0GA" association="_DN566MN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN566sN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN5668N3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wolEDGREee_69jl7_GsIw" memberEnd="_5wolDTGREee_69jl7_GsIw _5wolETGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wolETGREee_69jl7_GsIw" visibility="public" type="_5wolDDGREee_69jl7_GsIw" association="_5wolEDGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wolEjGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wolEzGREee_69jl7_GsIw"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN567MN3EeaZSLuq8Cw0GA" memberEnd="_DN561MN3EeaZSLuq8Cw0GA _DN567cN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN567cN3EeaZSLuq8Cw0GA" visibility="public" type="_DN560cN3EeaZSLuq8Cw0GA" association="_DN567MN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN567sN3EeaZSLuq8Cw0GA" memberEnd="_DN5618N3EeaZSLuq8Cw0GA _DN5678N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN5678N3EeaZSLuq8Cw0GA" visibility="public" type="_DN560cN3EeaZSLuq8Cw0GA" association="_DN567sN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN568MN3EeaZSLuq8Cw0GA" name="WasDerivedFrom" memberEnd="_DN562sN3EeaZSLuq8Cw0GA _DN568cN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN568cN3EeaZSLuq8Cw0GA" visibility="public" type="_DN560cN3EeaZSLuq8Cw0GA" association="_DN568MN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN568sN3EeaZSLuq8Cw0GA" memberEnd="_DN563cN3EeaZSLuq8Cw0GA _DN5688N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN5688N3EeaZSLuq8Cw0GA" visibility="public" type="_DN560cN3EeaZSLuq8Cw0GA" association="_DN568sN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Usage" xmi:id="_DN569MN3EeaZSLuq8Cw0GA" supplier="_DN5598N3EeaZSLuq8Cw0GA" client="_DN564MN3EeaZSLuq8Cw0GA"/>
-      <packagedElement xmi:type="uml:Usage" xmi:id="_DN569cN3EeaZSLuq8Cw0GA" supplier="_DN551cN3EeaZSLuq8Cw0GA" client="_DN564cN3EeaZSLuq8Cw0GA"/>
-      <packagedElement xmi:type="uml:Usage" xmi:id="_DN569sN3EeaZSLuq8Cw0GA" supplier="_DN56AMN3EeaZSLuq8Cw0GA" client="_DN5658N3EeaZSLuq8Cw0GA"/>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN5698N3EeaZSLuq8Cw0GA" name="EntityDescription">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56-MN3EeaZSLuq8Cw0GA" name="wasGeneratedByDescription" visibility="public" type="_DN57HcN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN57CMN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN56-cN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56-sN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56-8N3EeaZSLuq8Cw0GA" name="usedDescription" visibility="public" type="_DN6glMN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN57CsN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN56_MN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56_cN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN56_sN3EeaZSLuq8Cw0GA" name="dataset" visibility="public" type="_DN6gmsN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN6gmMN3EeaZSLuq8Cw0GA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN56_8N3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN57AMN3EeaZSLuq8Cw0GA" name="id" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN57AcN3EeaZSLuq8Cw0GA" name="label" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN57AsN3EeaZSLuq8Cw0GA" name="annotation" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN57A8N3EeaZSLuq8Cw0GA" name="dataproduct_type" visibility="public" clientDependency="_DN57DMN3EeaZSLuq8Cw0GA" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN57BMN3EeaZSLuq8Cw0GA" name="dataproduct_subtype" visibility="public" clientDependency="_DN57DcN3EeaZSLuq8Cw0GA" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN57BcN3EeaZSLuq8Cw0GA" name="level" visibility="public" clientDependency="_DN57DsN3EeaZSLuq8Cw0GA" type="_DN5SZMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN57BsN3EeaZSLuq8Cw0GA" name="docu_link" visibility="public" type="_DN5STsN3EeaZSLuq8Cw0GA" isUnique="false">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN57B8N3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN57CMN3EeaZSLuq8Cw0GA" memberEnd="_DN56-MN3EeaZSLuq8Cw0GA _DN57CcN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN57CcN3EeaZSLuq8Cw0GA" visibility="public" type="_DN5698N3EeaZSLuq8Cw0GA" association="_DN57CMN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN57CsN3EeaZSLuq8Cw0GA" memberEnd="_DN56-8N3EeaZSLuq8Cw0GA _DN57C8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN57C8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN5698N3EeaZSLuq8Cw0GA" association="_DN57CsN3EeaZSLuq8Cw0GA"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Usage" xmi:id="_DN57DMN3EeaZSLuq8Cw0GA" supplier="_DN55v8N3EeaZSLuq8Cw0GA" client="_DN57A8N3EeaZSLuq8Cw0GA"/>
-      <packagedElement xmi:type="uml:Usage" xmi:id="_DN57DcN3EeaZSLuq8Cw0GA" supplier="_DN55wcN3EeaZSLuq8Cw0GA" client="_DN57BMN3EeaZSLuq8Cw0GA"/>
-      <packagedElement xmi:type="uml:Usage" xmi:id="_DN57DsN3EeaZSLuq8Cw0GA" supplier="_DN55lMN3EeaZSLuq8Cw0GA" client="_DN57BcN3EeaZSLuq8Cw0GA"/>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN57D8N3EeaZSLuq8Cw0GA" name="Used">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN57EMN3EeaZSLuq8Cw0GA" name="usedDescription" visibility="public" type="_DN6glMN3EeaZSLuq8Cw0GA" association="_DN57EsN3EeaZSLuq8Cw0GA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN57EcN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN57EsN3EeaZSLuq8Cw0GA" memberEnd="_DN57EMN3EeaZSLuq8Cw0GA _DN57E8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN57E8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN57D8N3EeaZSLuq8Cw0GA" association="_DN57EsN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN57FMN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN57FcN3EeaZSLuq8Cw0GA"/>
-        </ownedEnd>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN57FsN3EeaZSLuq8Cw0GA" name="WasGeneratedBy">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN57F8N3EeaZSLuq8Cw0GA" name="wasGeneratedByDescription" visibility="public" type="_DN57HcN3EeaZSLuq8Cw0GA" association="_DN57GcN3EeaZSLuq8Cw0GA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN57GMN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wolFDGREee_69jl7_GsIw" name="WasGeneratedBy">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolFTGREee_69jl7_GsIw" name="wasGeneratedByDescription" visibility="public" type="_5wolHDGREee_69jl7_GsIw" association="_5wolGDGREee_69jl7_GsIw">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wolFjGREee_69jl7_GsIw"/>
         </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolFzGREee_69jl7_GsIw" name="role" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN57GcN3EeaZSLuq8Cw0GA" memberEnd="_DN57F8N3EeaZSLuq8Cw0GA _DN57GsN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN57GsN3EeaZSLuq8Cw0GA" visibility="public" type="_DN57FsN3EeaZSLuq8Cw0GA" association="_DN57GcN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN57G8N3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN57HMN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wolGDGREee_69jl7_GsIw" memberEnd="_5wolFTGREee_69jl7_GsIw _5wolGTGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wolGTGREee_69jl7_GsIw" visibility="public" type="_5wolFDGREee_69jl7_GsIw" association="_5wolGDGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wolGjGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wolGzGREee_69jl7_GsIw"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN57HcN3EeaZSLuq8Cw0GA" name="WasGeneratedByDescription">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN57HsN3EeaZSLuq8Cw0GA" name="role" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wolHDGREee_69jl7_GsIw" name="WasGeneratedByDescription">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolHTGREee_69jl7_GsIw" name="role" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN57H8N3EeaZSLuq8Cw0GA" name="Agent">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN57IMN3EeaZSLuq8Cw0GA" name="party" visibility="public" type="_DN56ZsN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN56jMN3EeaZSLuq8Cw0GA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN57IcN3EeaZSLuq8Cw0GA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN57IsN3EeaZSLuq8Cw0GA" name="wasAttributedTo" visibility="public" type="_DN6gYMN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN57KsN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN57I8N3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN57JMN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wolHjGREee_69jl7_GsIw" name="Agent">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolHzGREee_69jl7_GsIw" name="wasAttributedTo" visibility="public" type="_5wolLTGREee_69jl7_GsIw" aggregation="composite" association="_5wolJzGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wolIDGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wolITGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN57JcN3EeaZSLuq8Cw0GA" name="wasAssociatedWith" visibility="public" type="_DN57LsN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN57LMN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN57JsN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN57J8N3EeaZSLuq8Cw0GA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolIjGREee_69jl7_GsIw" name="wasAssociatedWith" visibility="public" type="_5wolKzGREee_69jl7_GsIw" aggregation="composite" association="_5wolKTGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wolIzGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wolJDGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN57KMN3EeaZSLuq8Cw0GA" name="id" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN57KcN3EeaZSLuq8Cw0GA" name="name" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolJTGREee_69jl7_GsIw" name="id" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolJjGREee_69jl7_GsIw" name="name" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN57KsN3EeaZSLuq8Cw0GA" memberEnd="_DN57IsN3EeaZSLuq8Cw0GA _DN57K8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN57K8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN57H8N3EeaZSLuq8Cw0GA" association="_DN57KsN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wolJzGREee_69jl7_GsIw" memberEnd="_5wolHzGREee_69jl7_GsIw _5wolKDGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wolKDGREee_69jl7_GsIw" visibility="public" type="_5wolHjGREee_69jl7_GsIw" association="_5wolJzGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN57LMN3EeaZSLuq8Cw0GA" memberEnd="_DN57JcN3EeaZSLuq8Cw0GA _DN57LcN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN57LcN3EeaZSLuq8Cw0GA" visibility="public" type="_DN57H8N3EeaZSLuq8Cw0GA" association="_DN57LMN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wolKTGREee_69jl7_GsIw" memberEnd="_5wolIjGREee_69jl7_GsIw _5wolKjGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wolKjGREee_69jl7_GsIw" visibility="public" type="_5wolHjGREee_69jl7_GsIw" association="_5wolKTGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN57LsN3EeaZSLuq8Cw0GA" name="WasAssociatedWith">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN57L8N3EeaZSLuq8Cw0GA" name="role" visibility="public" type="_DN6ge8N3EeaZSLuq8Cw0GA" isUnique="false"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wolKzGREee_69jl7_GsIw" name="WasAssociatedWith">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolLDGREee_69jl7_GsIw" name="role" visibility="public" type="_5wolRzGREee_69jl7_GsIw" isUnique="false"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN6gYMN3EeaZSLuq8Cw0GA" name="WasAttributedTo">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN6gYcN3EeaZSLuq8Cw0GA" name="role" visibility="public" type="_DN6ge8N3EeaZSLuq8Cw0GA" isUnique="false"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wolLTGREee_69jl7_GsIw" name="WasAttributedTo">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolLjGREee_69jl7_GsIw" name="role" visibility="public" type="_5wolRzGREee_69jl7_GsIw" isUnique="false"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN6gYsN3EeaZSLuq8Cw0GA" name="ActivityFlow">
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN6gY8N3EeaZSLuq8Cw0GA" general="_DN56j8N3EeaZSLuq8Cw0GA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN6gZMN3EeaZSLuq8Cw0GA" name="hadStep" visibility="public" type="_DN6gcMN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN6gZ8N3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN6gZcN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN6gZsN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wolLzGREee_69jl7_GsIw" name="ActivityFlow">
+        <generalization xmi:type="uml:Generalization" xmi:id="_5wolMDGREee_69jl7_GsIw" general="_5wokkjGREee_69jl7_GsIw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolMTGREee_69jl7_GsIw" name="hadStep" visibility="public" type="_5wolPTGREee_69jl7_GsIw" aggregation="composite" association="_5wolNDGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wolMjGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wolMzGREee_69jl7_GsIw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN6gZ8N3EeaZSLuq8Cw0GA" memberEnd="_DN6gZMN3EeaZSLuq8Cw0GA _DN6gaMN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN6gaMN3EeaZSLuq8Cw0GA" visibility="public" type="_DN6gYsN3EeaZSLuq8Cw0GA" association="_DN6gZ8N3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wolNDGREee_69jl7_GsIw" memberEnd="_5wolMTGREee_69jl7_GsIw _5wolNTGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wolNTGREee_69jl7_GsIw" visibility="public" type="_5wolLzGREee_69jl7_GsIw" association="_5wolNDGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN6gacN3EeaZSLuq8Cw0GA" name="Collection">
-        <generalization xmi:type="uml:Generalization" xmi:id="_DN6gasN3EeaZSLuq8Cw0GA" general="_DN560cN3EeaZSLuq8Cw0GA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN6ga8N3EeaZSLuq8Cw0GA" name="hadMember" visibility="public" type="_DN6gdsN3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN6gbsN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN6gbMN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN6gbcN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wolNjGREee_69jl7_GsIw" name="Collection">
+        <generalization xmi:type="uml:Generalization" xmi:id="_5wolNzGREee_69jl7_GsIw" general="_5wok1zGREee_69jl7_GsIw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolODGREee_69jl7_GsIw" name="hadMember" visibility="public" type="_5wolQjGREee_69jl7_GsIw" aggregation="composite" association="_5wolOzGREee_69jl7_GsIw">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wolOTGREee_69jl7_GsIw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wolOjGREee_69jl7_GsIw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN6gbsN3EeaZSLuq8Cw0GA" memberEnd="_DN6ga8N3EeaZSLuq8Cw0GA _DN6gb8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN6gb8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN6gacN3EeaZSLuq8Cw0GA" association="_DN6gbsN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wolOzGREee_69jl7_GsIw" memberEnd="_5wolODGREee_69jl7_GsIw _5wolPDGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wolPDGREee_69jl7_GsIw" visibility="public" type="_5wolNjGREee_69jl7_GsIw" association="_5wolOzGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN6gcMN3EeaZSLuq8Cw0GA" name="HadStep">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN6gccN3EeaZSLuq8Cw0GA" name="activity" visibility="public" type="_DN56j8N3EeaZSLuq8Cw0GA" aggregation="composite" association="_DN6gcsN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wolPTGREee_69jl7_GsIw" name="HadStep">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolPjGREee_69jl7_GsIw" name="activity" visibility="public" type="_5wokkjGREee_69jl7_GsIw" association="_5wolPzGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN6gcsN3EeaZSLuq8Cw0GA" memberEnd="_DN6gccN3EeaZSLuq8Cw0GA _DN6gc8N3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN6gc8N3EeaZSLuq8Cw0GA" visibility="public" type="_DN6gcMN3EeaZSLuq8Cw0GA" association="_DN6gcsN3EeaZSLuq8Cw0GA">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DN6gdMN3EeaZSLuq8Cw0GA" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN6gdcN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wolPzGREee_69jl7_GsIw" memberEnd="_5wolPjGREee_69jl7_GsIw _5wolQDGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wolQDGREee_69jl7_GsIw" visibility="public" type="_5wolPTGREee_69jl7_GsIw" association="_5wolPzGREee_69jl7_GsIw">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wolQTGREee_69jl7_GsIw"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN6gdsN3EeaZSLuq8Cw0GA" name="HadMember">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN6gd8N3EeaZSLuq8Cw0GA" name="entity" visibility="public" type="_DN560cN3EeaZSLuq8Cw0GA" association="_DN6geMN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wolQjGREee_69jl7_GsIw" name="HadMember">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolQzGREee_69jl7_GsIw" name="entity" visibility="public" type="_5wok1zGREee_69jl7_GsIw" association="_5wolRDGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN6geMN3EeaZSLuq8Cw0GA" memberEnd="_DN6gd8N3EeaZSLuq8Cw0GA _DN6gecN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN6gecN3EeaZSLuq8Cw0GA" visibility="public" type="_DN6gdsN3EeaZSLuq8Cw0GA" association="_DN6geMN3EeaZSLuq8Cw0GA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN6gesN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wolRDGREee_69jl7_GsIw" memberEnd="_5wolQzGREee_69jl7_GsIw _5wolRTGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wolRTGREee_69jl7_GsIw" visibility="public" type="_5wolQjGREee_69jl7_GsIw" association="_5wolRDGREee_69jl7_GsIw">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wolRjGREee_69jl7_GsIw"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_DN6ge8N3EeaZSLuq8Cw0GA" name="AgentRole">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN6gfMN3EeaZSLuq8Cw0GA" name="Observer"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN6gfcN3EeaZSLuq8Cw0GA" name="Creator"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN6gfsN3EeaZSLuq8Cw0GA" name="Author"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN6gf8N3EeaZSLuq8Cw0GA" name="Editor"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN6ggMN3EeaZSLuq8Cw0GA" name="Publisher"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN6ggcN3EeaZSLuq8Cw0GA" name="Operator"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN6ggsN3EeaZSLuq8Cw0GA" name="Coordinator"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_DN6gg8N3EeaZSLuq8Cw0GA" name="Provider"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN6ghMN3EeaZSLuq8Cw0GA" name="Parameter">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN6ghcN3EeaZSLuq8Cw0GA" name="parameterDescription" visibility="public" type="_DN6gi8N3EeaZSLuq8Cw0GA" association="_DN6gicN3EeaZSLuq8Cw0GA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DN6ghsN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_5wolRzGREee_69jl7_GsIw" name="AgentRole">
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5wolSDGREee_69jl7_GsIw" name="Observer"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5wolSTGREee_69jl7_GsIw" name="Creator"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5wolSjGREee_69jl7_GsIw" name="Author"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5wolSzGREee_69jl7_GsIw" name="Editor"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5wolTDGREee_69jl7_GsIw" name="Publisher"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5wolTTGREee_69jl7_GsIw" name="Operator"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5wolTjGREee_69jl7_GsIw" name="Coordinator"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5wolTzGREee_69jl7_GsIw" name="Provider"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wolUDGREee_69jl7_GsIw" name="Parameter">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolUTGREee_69jl7_GsIw" name="parameterDescription" visibility="public" type="_5wolVzGREee_69jl7_GsIw" association="_5wolVTGREee_69jl7_GsIw">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wolUjGREee_69jl7_GsIw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN6gh8N3EeaZSLuq8Cw0GA" name="id" visibility="public" isUnique="false">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolUzGREee_69jl7_GsIw" name="id" visibility="public" isUnique="false">
           <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN6giMN3EeaZSLuq8Cw0GA" name="value" visibility="public" isUnique="false">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolVDGREee_69jl7_GsIw" name="value" visibility="public" isUnique="false">
           <type xmi:type="uml:PrimitiveType" href="http://www.omg.org/spec/UML/20110701/PrimitiveTypes.xmi#String"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN6gicN3EeaZSLuq8Cw0GA" memberEnd="_DN6ghcN3EeaZSLuq8Cw0GA _DN6gisN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN6gisN3EeaZSLuq8Cw0GA" visibility="public" type="_DN6ghMN3EeaZSLuq8Cw0GA" association="_DN6gicN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_5wolVTGREee_69jl7_GsIw" memberEnd="_5wolUTGREee_69jl7_GsIw _5wolVjGREee_69jl7_GsIw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5wolVjGREee_69jl7_GsIw" visibility="public" type="_5wolUDGREee_69jl7_GsIw" association="_5wolVTGREee_69jl7_GsIw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN6gi8N3EeaZSLuq8Cw0GA" name="ParameterDescription">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN6gjMN3EeaZSLuq8Cw0GA" name="id" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN6gjcN3EeaZSLuq8Cw0GA" name="label" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN6gjsN3EeaZSLuq8Cw0GA" name="annotation" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN6gj8N3EeaZSLuq8Cw0GA" name="datatype" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_DN6gkMN3EeaZSLuq8Cw0GA">
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wolVzGREee_69jl7_GsIw" name="ParameterDescription">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolWDGREee_69jl7_GsIw" name="id" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolWTGREee_69jl7_GsIw" name="name" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolWjGREee_69jl7_GsIw" name="annotation" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolWzGREee_69jl7_GsIw" name="datatype" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_5wolXDGREee_69jl7_GsIw">
             <body><Enter note text here></body>
           </ownedComment>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN6gkcN3EeaZSLuq8Cw0GA" name="unit" visibility="public" type="_DN5SUcN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN6gksN3EeaZSLuq8Cw0GA" name="ucd" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN6gk8N3EeaZSLuq8Cw0GA" name="utype" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN6glMN3EeaZSLuq8Cw0GA" name="UsedDescription">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_DN6glcN3EeaZSLuq8Cw0GA" name="role" visibility="public" type="_DN5SXMN3EeaZSLuq8Cw0GA" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolXTGREee_69jl7_GsIw" name="unit" visibility="public" type="_5wokfDGREee_69jl7_GsIw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolXjGREee_69jl7_GsIw" name="ucd" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolXzGREee_69jl7_GsIw" name="utype" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
       </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_DN6glsN3EeaZSLuq8Cw0GA" name="ds">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_DN6gl8N3EeaZSLuq8Cw0GA">
-        <body>This is the model-import-stereotype for importing the Dataset Metadata model.</body>
-      </ownedComment>
-      <packagedElement xmi:type="uml:Association" xmi:id="_DN6gmMN3EeaZSLuq8Cw0GA" name="dataset" memberEnd="_DN56_sN3EeaZSLuq8Cw0GA _DN6gmcN3EeaZSLuq8Cw0GA">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_DN6gmcN3EeaZSLuq8Cw0GA" visibility="public" type="_DN5698N3EeaZSLuq8Cw0GA" association="_DN6gmMN3EeaZSLuq8Cw0GA"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_5wolYDGREee_69jl7_GsIw" name="UsedDescription">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5wolYTGREee_69jl7_GsIw" name="role" visibility="public" type="_5wokhzGREee_69jl7_GsIw" isUnique="false"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_DN6gmsN3EeaZSLuq8Cw0GA" name="Dataset" isAbstract="true"/>
     </packagedElement>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_DN5SQMN3EeaZSLuq8Cw0GA" xmi:id="_DRpw4MN3EeaZSLuq8Cw0GA">
-      <eAnnotations xmi:id="_DRrmEMN3EeaZSLuq8Cw0GA" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="IVOA_UML_Profile.profile.xmi#_DOFfh8N3EeaZSLuq8Cw0GA"/>
+    <packagedElement xmi:type="uml:InformationItem" xmi:id="_5wolYjGREee_69jl7_GsIw" name="Provenance Data Model V1.0"/>
+    <packagedElement xmi:type="uml:InformationItem" xmi:id="_5wolYzGREee_69jl7_GsIw" name="IVOA Base Types V1.0 (2016)"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_5wokcDGREee_69jl7_GsIw" xmi:id="_5w-isDGREee_69jl7_GsIw">
+      <eAnnotations xmi:id="_5w-isTGREee_69jl7_GsIw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="IVOA_UML_Profile.profile.xmi#_5wqZpzGREee_69jl7_GsIw"/>
       </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_DRpw4MN3EeaZSLuq8Cw0GA" href="IVOA_UML_Profile.profile.xmi#_DOFfgMN3EeaZSLuq8Cw0GA"/>
+      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_5w-isDGREee_69jl7_GsIw" href="IVOA_UML_Profile.profile.xmi#_5wqZoDGREee_69jl7_GsIw"/>
     </profileApplication>
   </uml:Model>
-  <IVOA_UML_Profile:primitive xmi:id="_DR5BcMN3EeaZSLuq8Cw0GA" base_DataType="_DN5SXMN3EeaZSLuq8Cw0GA" base_PrimitiveType="_DN5SXMN3EeaZSLuq8Cw0GA"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_DR5ogMN3EeaZSLuq8Cw0GA" base_NamedElement="_DN5SXMN3EeaZSLuq8Cw0GA" vodmlid="string"/>
-  <IVOA_UML_Profile:primitive xmi:id="_DR6PkMN3EeaZSLuq8Cw0GA" base_DataType="_DN5SXcN3EeaZSLuq8Cw0GA" base_PrimitiveType="_DN5SXcN3EeaZSLuq8Cw0GA"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_DR6PkcN3EeaZSLuq8Cw0GA" base_NamedElement="_DN5SXcN3EeaZSLuq8Cw0GA" vodmlid="boolean"/>
-  <IVOA_UML_Profile:primitive xmi:id="_DR62oMN3EeaZSLuq8Cw0GA" base_DataType="_DN5SXsN3EeaZSLuq8Cw0GA" base_PrimitiveType="_DN5SXsN3EeaZSLuq8Cw0GA"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_DR62ocN3EeaZSLuq8Cw0GA" base_NamedElement="_DN5SXsN3EeaZSLuq8Cw0GA" vodmlid="complex"/>
-  <IVOA_UML_Profile:primitive xmi:id="_DR62osN3EeaZSLuq8Cw0GA" base_DataType="_DN5SYcN3EeaZSLuq8Cw0GA" base_PrimitiveType="_DN5SYcN3EeaZSLuq8Cw0GA"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_DR62o8N3EeaZSLuq8Cw0GA" base_NamedElement="_DN5SYcN3EeaZSLuq8Cw0GA" vodmlid="rational"/>
-  <IVOA_UML_Profile:primitive xmi:id="_DR7dsMN3EeaZSLuq8Cw0GA" base_DataType="_DN5SZMN3EeaZSLuq8Cw0GA" base_PrimitiveType="_DN5SZMN3EeaZSLuq8Cw0GA"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_DR7dscN3EeaZSLuq8Cw0GA" base_NamedElement="_DN5SZMN3EeaZSLuq8Cw0GA" vodmlid="integer"/>
-  <IVOA_UML_Profile:modelimport xmi:id="_DR8EwMN3EeaZSLuq8Cw0GA" base_Package="_DN6glsN3EeaZSLuq8Cw0GA" name="Dataset Metadata" version="1.0" url="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/datasetModel_uml2p4p1.xmi" documentationURL="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_DR8EwcN3EeaZSLuq8Cw0GA" base_NamedElement="_DN6gmsN3EeaZSLuq8Cw0GA" vodmlid="dataset"/>
+  <IVOA_UML_Profile:primitive xmi:id="_5xA-8DGREee_69jl7_GsIw" base_DataType="_5wokhzGREee_69jl7_GsIw" base_PrimitiveType="_5wokhzGREee_69jl7_GsIw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5xA-8TGREee_69jl7_GsIw" base_NamedElement="_5wokhzGREee_69jl7_GsIw" vodmlid="string"/>
+  <IVOA_UML_Profile:primitive xmi:id="_5xA-8jGREee_69jl7_GsIw" base_DataType="_5wokiDGREee_69jl7_GsIw" base_PrimitiveType="_5wokiDGREee_69jl7_GsIw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5xA-8zGREee_69jl7_GsIw" base_NamedElement="_5wokiDGREee_69jl7_GsIw" vodmlid="boolean"/>
+  <IVOA_UML_Profile:primitive xmi:id="_5xA-9DGREee_69jl7_GsIw" base_DataType="_5wokiTGREee_69jl7_GsIw" base_PrimitiveType="_5wokiTGREee_69jl7_GsIw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5xBmADGREee_69jl7_GsIw" base_NamedElement="_5wokiTGREee_69jl7_GsIw" vodmlid="complex"/>
+  <IVOA_UML_Profile:primitive xmi:id="_5xBmATGREee_69jl7_GsIw" base_DataType="_5wokjDGREee_69jl7_GsIw" base_PrimitiveType="_5wokjDGREee_69jl7_GsIw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5xBmAjGREee_69jl7_GsIw" base_NamedElement="_5wokjDGREee_69jl7_GsIw" vodmlid="rational"/>
+  <IVOA_UML_Profile:primitive xmi:id="_5xBmAzGREee_69jl7_GsIw" base_DataType="_5wokjzGREee_69jl7_GsIw" base_PrimitiveType="_5wokjzGREee_69jl7_GsIw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_5xBmBDGREee_69jl7_GsIw" base_NamedElement="_5wokjzGREee_69jl7_GsIw" vodmlid="integer"/>
+  <IVOA_UML_Profile:model xmi:id="_5xCNEDGREee_69jl7_GsIw" base_Package="_5wokkDGREee_69jl7_GsIw"/>
 </xmi:XMI>


More information about the Volutecommits mailing list