[Volute] r3545 - trunk/projects/dm/DatasetMetadata-1.0/model

Volute commit messages volutecommits at g-vo.org
Wed Oct 26 18:05:41 CEST 2016


Author: mdittmar
Date: Mon Sep 12 23:17:22 2016
New Revision: 3545

Log:
update Dataset model to revised ivoa model import spec

Modified:
   trunk/projects/dm/DatasetMetadata-1.0/model/DatasetMetadata.zip
   trunk/projects/dm/DatasetMetadata-1.0/model/datasetModel_uml2p4p1.xmi

Modified: trunk/projects/dm/DatasetMetadata-1.0/model/DatasetMetadata.zip
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/DatasetMetadata-1.0/model/datasetModel_uml2p4p1.xmi
==============================================================================
--- trunk/projects/dm/DatasetMetadata-1.0/model/datasetModel_uml2p4p1.xmi	Mon Sep 12 23:15:36 2016	(r3544)
+++ trunk/projects/dm/DatasetMetadata-1.0/model/datasetModel_uml2p4p1.xmi	Mon Sep 12 23:17:22 2016	(r3545)
@@ -1,478 +1,371 @@
-<?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/_amq4YA2BEea1vOibJ5Calw/0" xmlns:default="http:///schemas/default/_am9zUA2BEea1vOibJ5Calw/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/20100901 http:///schemas/IVOA_UML_Profile/_amq4YA2BEea1vOibJ5Calw/0 IVOA_UML_Profile.profile.xmi#_anQuRw2BEea1vOibJ5Calw http:///schemas/default/_am9zUA2BEea1vOibJ5Calw/0 default.profile.xmi#_azyHVw2BEea1vOibJ5Calw">
-  <uml:Model xmi:id="_amhHYA2BEea1vOibJ5Calw" name="ds">
-    <eAnnotations xmi:id="_amhHYQ2BEea1vOibJ5Calw" source="Objing">
-      <contents xmi:type="uml:Property" xmi:id="_amhHYg2BEea1vOibJ5Calw" name="exporterVersion">
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHYw2BEea1vOibJ5Calw" 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/_yEmgoHkoEeanaZ15xYvgrw/0" xmlns:default="http:///schemas/default/_yFppgHkoEeanaZ15xYvgrw/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/20100901 http:///schemas/IVOA_UML_Profile/_yEmgoHkoEeanaZ15xYvgrw/0 IVOA_UML_Profile.profile.xmi#_yF8kd3koEeanaZ15xYvgrw http:///schemas/default/_yFppgHkoEeanaZ15xYvgrw/0 default.profile.xmi#_yRRqt3koEeanaZ15xYvgrw">
+  <uml:Model xmi:id="_yETlsHkoEeanaZ15xYvgrw" name="ds">
+    <eAnnotations xmi:id="_yETlsXkoEeanaZ15xYvgrw" source="Objing">
+      <contents xmi:type="uml:Property" xmi:id="_yETlsnkoEeanaZ15xYvgrw" name="exporterVersion">
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETls3koEeanaZ15xYvgrw" value="3.0.0"/>
       </contents>
-      <contents xmi:type="uml:Property" xmi:id="_amhHZA2BEea1vOibJ5Calw" name="isRoundTrip"/>
-      <contents xmi:type="uml:Property" xmi:id="_amhHZQ2BEea1vOibJ5Calw" name="Visibility">
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHZg2BEea1vOibJ5Calw" value="0"/>
+      <contents xmi:type="uml:Property" xmi:id="_yETltHkoEeanaZ15xYvgrw" name="isRoundTrip"/>
+      <contents xmi:type="uml:Property" xmi:id="_yETltXkoEeanaZ15xYvgrw" name="Visibility">
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETltnkoEeanaZ15xYvgrw" value="0"/>
       </contents>
     </eAnnotations>
-    <ownedComment xmi:type="uml:Comment" xmi:id="_amhHZw2BEea1vOibJ5Calw">
-      <eAnnotations xmi:id="_amhHaA2BEea1vOibJ5Calw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_amhHaQ2BEea1vOibJ5Calw" name="NoteType_Name">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHag2BEea1vOibJ5Calw" value="description"/>
+    <ownedComment xmi:type="uml:Comment" xmi:id="_yETlt3koEeanaZ15xYvgrw">
+      <eAnnotations xmi:id="_yETluHkoEeanaZ15xYvgrw" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_yETluXkoEeanaZ15xYvgrw" name="NoteType_Name">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETlunkoEeanaZ15xYvgrw" value="description"/>
         </contents>
       </eAnnotations>
       <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="_amhHaw2BEea1vOibJ5Calw" constrainedElement="_amhJUw2BEea1vOibJ5Calw">
-      <specification xmi:type="uml:LiteralString" xmi:id="_amhHbA2BEea1vOibJ5Calw" value="ds:party.Role.party"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_yETlu3koEeanaZ15xYvgrw" constrainedElement="_yETnY3koEeanaZ15xYvgrw">
+      <specification xmi:type="uml:LiteralString" xmi:id="_yETlvHkoEeanaZ15xYvgrw" value="ds:party.Role.party"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_amhHbQ2BEea1vOibJ5Calw" constrainedElement="_amhMWQ2BEea1vOibJ5Calw">
-      <specification xmi:type="uml:LiteralString" xmi:id="_amhHbg2BEea1vOibJ5Calw" value="ds:party.Role.party"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_yETlvXkoEeanaZ15xYvgrw" constrainedElement="_yETqYXkoEeanaZ15xYvgrw">
+      <specification xmi:type="uml:LiteralString" xmi:id="_yETlvnkoEeanaZ15xYvgrw" value="ds:party.Role.party"/>
     </ownedRule>
-    <packagedElement xmi:type="uml:Package" xmi:id="_amhHbw2BEea1vOibJ5Calw" name="ivoa">
-      <eAnnotations xmi:id="_amhHcA2BEea1vOibJ5Calw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_amhHcQ2BEea1vOibJ5Calw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHcg2BEea1vOibJ5Calw" value="0"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_yETlv3koEeanaZ15xYvgrw" name="ivoa">
+      <eAnnotations xmi:id="_yETlwHkoEeanaZ15xYvgrw" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_yETlwXkoEeanaZ15xYvgrw" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETlwnkoEeanaZ15xYvgrw" value="0"/>
         </contents>
       </eAnnotations>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_amhHcw2BEea1vOibJ5Calw">
-        <eAnnotations xmi:id="_amhHdA2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhHdQ2BEea1vOibJ5Calw" name="NoteType_Name">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHdg2BEea1vOibJ5Calw" value="description"/>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_yETlw3koEeanaZ15xYvgrw">
+        <eAnnotations xmi:id="_yETlxHkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETlxXkoEeanaZ15xYvgrw" name="NoteType_Name">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETlxnkoEeanaZ15xYvgrw" value="description"/>
           </contents>
         </eAnnotations>
         <body>Base Data Types V1.0 (2014)</body>
       </ownedComment>
-      <packagedElement xmi:type="uml:Package" xmi:id="_amhHdw2BEea1vOibJ5Calw" name="quantity">
-        <eAnnotations xmi:id="_amhHeA2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhHeQ2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHeg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yETlx3koEeanaZ15xYvgrw" name="string">
+        <eAnnotations xmi:id="_yETlyHkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETlyXkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETlynkoEeanaZ15xYvgrw" value="0"/>
           </contents>
+          <contents xmi:type="uml:Property" xmi:id="_yETly3koEeanaZ15xYvgrw" name="isPrimitive"/>
         </eAnnotations>
-        <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_amhHew2BEea1vOibJ5Calw" name="Unit">
-          <eAnnotations xmi:id="_amhHfA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhHfQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHfg2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhHfw2BEea1vOibJ5Calw" name="isPrimitive"/>
-          </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_amhHgA2BEea1vOibJ5Calw" general="_amhH3w2BEea1vOibJ5Calw"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_amhHgQ2BEea1vOibJ5Calw" name="AtomicValue" isAbstract="true">
-          <eAnnotations xmi:id="_amhHgg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhHgw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHhA2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-          </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_amhHhQ2BEea1vOibJ5Calw" name="ucd" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-            <eAnnotations xmi:id="_amhHhg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhHhw2BEea1vOibJ5Calw" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHiA2BEea1vOibJ5Calw" value="0"/>
-              </contents>
-              <contents xmi:type="uml:Property" xmi:id="_amhHiQ2BEea1vOibJ5Calw" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHig2BEea1vOibJ5Calw" value="read_write"/>
-              </contents>
-            </eAnnotations>
-          </ownedAttribute>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_amhHiw2BEea1vOibJ5Calw" name="StringValue">
-          <eAnnotations xmi:id="_amhHjA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhHjQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHjg2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-          </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_amhHjw2BEea1vOibJ5Calw" general="_amhHgQ2BEea1vOibJ5Calw"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_amhHkA2BEea1vOibJ5Calw" name="value" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-            <eAnnotations xmi:id="_amhHkQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhHkg2BEea1vOibJ5Calw" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHkw2BEea1vOibJ5Calw" value="0"/>
-              </contents>
-              <contents xmi:type="uml:Property" xmi:id="_amhHlA2BEea1vOibJ5Calw" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHlQ2BEea1vOibJ5Calw" value="read_write"/>
-              </contents>
-            </eAnnotations>
-          </ownedAttribute>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_amhHlg2BEea1vOibJ5Calw" name="BooleanValue">
-          <eAnnotations xmi:id="_amhHlw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhHmA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHmQ2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-          </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_amhHmg2BEea1vOibJ5Calw" general="_amhHgQ2BEea1vOibJ5Calw"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_amhHmw2BEea1vOibJ5Calw" name="value" visibility="public" type="_amhH5A2BEea1vOibJ5Calw" isUnique="false">
-            <eAnnotations xmi:id="_amhHnA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhHnQ2BEea1vOibJ5Calw" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHng2BEea1vOibJ5Calw" value="0"/>
-              </contents>
-              <contents xmi:type="uml:Property" xmi:id="_amhHnw2BEea1vOibJ5Calw" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHoA2BEea1vOibJ5Calw" value="read_write"/>
-              </contents>
-            </eAnnotations>
-          </ownedAttribute>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_amhHoQ2BEea1vOibJ5Calw" name="Quantity" isAbstract="true">
-          <eAnnotations xmi:id="_amhHog2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhHow2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHpA2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-          </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_amhHpQ2BEea1vOibJ5Calw" general="_amhHgQ2BEea1vOibJ5Calw"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_amhHpg2BEea1vOibJ5Calw" name="unit" visibility="public" type="_amhHew2BEea1vOibJ5Calw" isUnique="false">
-            <eAnnotations xmi:id="_amhHpw2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhHqA2BEea1vOibJ5Calw" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHqQ2BEea1vOibJ5Calw" value="0"/>
-              </contents>
-              <contents xmi:type="uml:Property" xmi:id="_amhHqg2BEea1vOibJ5Calw" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHqw2BEea1vOibJ5Calw" value="read_write"/>
-              </contents>
-            </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhHrA2BEea1vOibJ5Calw"/>
-          </ownedAttribute>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_amhHrQ2BEea1vOibJ5Calw" name="IntegerQuantity">
-          <eAnnotations xmi:id="_amhHrg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhHrw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHsA2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-          </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_amhHsQ2BEea1vOibJ5Calw" general="_amhHoQ2BEea1vOibJ5Calw"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_amhHsg2BEea1vOibJ5Calw" name="value" visibility="public" type="_amhH6Q2BEea1vOibJ5Calw" isUnique="false">
-            <eAnnotations xmi:id="_amhHsw2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhHtA2BEea1vOibJ5Calw" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHtQ2BEea1vOibJ5Calw" value="0"/>
-              </contents>
-              <contents xmi:type="uml:Property" xmi:id="_amhHtg2BEea1vOibJ5Calw" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHtw2BEea1vOibJ5Calw" value="read_write"/>
-              </contents>
-            </eAnnotations>
-          </ownedAttribute>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_amhHuA2BEea1vOibJ5Calw" name="RealQuantity">
-          <eAnnotations xmi:id="_amhHuQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhHug2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHuw2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-          </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_amhHvA2BEea1vOibJ5Calw" general="_amhHoQ2BEea1vOibJ5Calw"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_amhHvQ2BEea1vOibJ5Calw" name="value" visibility="public" type="_amhH7g2BEea1vOibJ5Calw" isUnique="false">
-            <eAnnotations xmi:id="_amhHvg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhHvw2BEea1vOibJ5Calw" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHwA2BEea1vOibJ5Calw" value="0"/>
-              </contents>
-              <contents xmi:type="uml:Property" xmi:id="_amhHwQ2BEea1vOibJ5Calw" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHwg2BEea1vOibJ5Calw" value="read_write"/>
-              </contents>
-            </eAnnotations>
-          </ownedAttribute>
-        </packagedElement>
       </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_amhHww2BEea1vOibJ5Calw" name="Identity">
-        <eAnnotations xmi:id="_amhHxA2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhHxQ2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHxg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yETlzHkoEeanaZ15xYvgrw" name="boolean">
+        <eAnnotations xmi:id="_yETlzXkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETlznkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETlz3koEeanaZ15xYvgrw" value="0"/>
           </contents>
+          <contents xmi:type="uml:Property" xmi:id="_yETl0HkoEeanaZ15xYvgrw" name="isPrimitive"/>
         </eAnnotations>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhHxw2BEea1vOibJ5Calw" name="id" visibility="public" type="_amhH6Q2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhHyA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhHyQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHyg2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhHyw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhHzA2BEea1vOibJ5Calw" value="read_write"/>
-            </contents>
-          </eAnnotations>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhHzQ2BEea1vOibJ5Calw" name="xmlId" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhHzg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhHzw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhH0A2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhH0Q2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhH0g2BEea1vOibJ5Calw" value="read_write"/>
-            </contents>
-          </eAnnotations>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhH0w2BEea1vOibJ5Calw" name="ivoId" visibility="public" type="_amhH_Q2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhH1A2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhH1Q2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhH1g2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhH1w2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhH2A2BEea1vOibJ5Calw" value="read_write"/>
-            </contents>
-          </eAnnotations>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhH2Q2BEea1vOibJ5Calw" name="publisherDID" visibility="public" type="_amhH_Q2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhH2g2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhH2w2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhH3A2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhH3Q2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhH3g2BEea1vOibJ5Calw" value="read_write"/>
-            </contents>
-          </eAnnotations>
-        </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_amhH3w2BEea1vOibJ5Calw" name="string">
-        <eAnnotations xmi:id="_amhH4A2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhH4Q2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhH4g2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yETl0XkoEeanaZ15xYvgrw" name="integer">
+        <eAnnotations xmi:id="_yETl0nkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETl03koEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETl1HkoEeanaZ15xYvgrw" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_amhH4w2BEea1vOibJ5Calw" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yETl1XkoEeanaZ15xYvgrw" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_amhH5A2BEea1vOibJ5Calw" name="boolean">
-        <eAnnotations xmi:id="_amhH5Q2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhH5g2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhH5w2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yETl1nkoEeanaZ15xYvgrw" name="real">
+        <eAnnotations xmi:id="_yETl13koEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETl2HkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETl2XkoEeanaZ15xYvgrw" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_amhH6A2BEea1vOibJ5Calw" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yETl2nkoEeanaZ15xYvgrw" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_amhH6Q2BEea1vOibJ5Calw" name="integer">
-        <eAnnotations xmi:id="_amhH6g2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhH6w2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhH7A2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yETl23koEeanaZ15xYvgrw" name="nonnegativeinteger">
+        <eAnnotations xmi:id="_yETl3HkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETl3XkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETl3nkoEeanaZ15xYvgrw" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_amhH7Q2BEea1vOibJ5Calw" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yETl33koEeanaZ15xYvgrw" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_amhH7g2BEea1vOibJ5Calw" name="real">
-        <eAnnotations xmi:id="_amhH7w2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhH8A2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhH8Q2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yETl4HkoEeanaZ15xYvgrw" name="datetime">
+        <eAnnotations xmi:id="_yETl4XkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETl4nkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETl43koEeanaZ15xYvgrw" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_amhH8g2BEea1vOibJ5Calw" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yETl5HkoEeanaZ15xYvgrw" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_amhH8w2BEea1vOibJ5Calw" name="decimal">
-        <eAnnotations xmi:id="_amhH9A2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhH9Q2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhH9g2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yETl5XkoEeanaZ15xYvgrw" name="anyURI">
+        <eAnnotations xmi:id="_yETl5nkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETl53koEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETl6HkoEeanaZ15xYvgrw" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_amhH9w2BEea1vOibJ5Calw" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yETl6XkoEeanaZ15xYvgrw" name="isPrimitive"/>
         </eAnnotations>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yETl6nkoEeanaZ15xYvgrw" general="_yETlx3koEeanaZ15xYvgrw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_amhH-A2BEea1vOibJ5Calw" name="datetime">
-        <eAnnotations xmi:id="_amhH-Q2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhH-g2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhH-w2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:InformationItem" xmi:id="_yETl63koEeanaZ15xYvgrw" name="IVOA Base Types V1.0 (2016)">
+        <eAnnotations xmi:id="_yETl7HkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETl7XkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETl7nkoEeanaZ15xYvgrw" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_amhH_A2BEea1vOibJ5Calw" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_amhH_Q2BEea1vOibJ5Calw" name="anyURI">
-        <eAnnotations xmi:id="_amhH_g2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhH_w2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIAA2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yETl73koEeanaZ15xYvgrw" name="Unit">
+        <eAnnotations xmi:id="_yETl8HkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETl8XkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETl8nkoEeanaZ15xYvgrw" value="0"/>
+          </contents>
+          <contents xmi:type="uml:Property" xmi:id="_yETl83koEeanaZ15xYvgrw" name="isPrimitive"/>
+        </eAnnotations>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yETl9HkoEeanaZ15xYvgrw" general="_yETlx3koEeanaZ15xYvgrw"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_yETl9XkoEeanaZ15xYvgrw" name="Quantity" isAbstract="true">
+        <eAnnotations xmi:id="_yETl9nkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETl93koEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETl-HkoEeanaZ15xYvgrw" value="0"/>
+          </contents>
+        </eAnnotations>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETl-XkoEeanaZ15xYvgrw" name="unit" visibility="public" type="_yETl73koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETl-nkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETl-3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETl_HkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETl_XkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETl_nkoEeanaZ15xYvgrw" value="read_write"/>
+            </contents>
+          </eAnnotations>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETl_3koEeanaZ15xYvgrw"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_yETmAHkoEeanaZ15xYvgrw" name="IntegerQuantity">
+        <eAnnotations xmi:id="_yETmAXkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETmAnkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmA3koEeanaZ15xYvgrw" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_amhIAQ2BEea1vOibJ5Calw" name="isPrimitive"/>
         </eAnnotations>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yETmBHkoEeanaZ15xYvgrw" general="_yETl9XkoEeanaZ15xYvgrw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETmBXkoEeanaZ15xYvgrw" name="value" visibility="public" type="_yETl0XkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETmBnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETmB3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmCHkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETmCXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmCnkoEeanaZ15xYvgrw" value="read_write"/>
+            </contents>
+          </eAnnotations>
+        </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:InformationItem" xmi:id="_amhIAg2BEea1vOibJ5Calw" name="IVOA Base Types V1.0 (2014)">
-        <eAnnotations xmi:id="_amhIAw2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhIBA2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIBQ2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_yETmC3koEeanaZ15xYvgrw" name="RealQuantity">
+        <eAnnotations xmi:id="_yETmDHkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETmDXkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmDnkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yETmD3koEeanaZ15xYvgrw" general="_yETl9XkoEeanaZ15xYvgrw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETmEHkoEeanaZ15xYvgrw" name="value" visibility="public" type="_yETl1nkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETmEXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETmEnkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmE3koEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETmFHkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmFXkoEeanaZ15xYvgrw" value="read_write"/>
+            </contents>
+          </eAnnotations>
+        </ownedAttribute>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_amhIBg2BEea1vOibJ5Calw" name="char">
-      <eAnnotations xmi:id="_amhIBw2BEea1vOibJ5Calw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_amhICA2BEea1vOibJ5Calw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhICQ2BEea1vOibJ5Calw" value="0"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_yETmFnkoEeanaZ15xYvgrw" name="char">
+      <eAnnotations xmi:id="_yETmF3koEeanaZ15xYvgrw" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_yETmGHkoEeanaZ15xYvgrw" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmGXkoEeanaZ15xYvgrw" value="0"/>
         </contents>
       </eAnnotations>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_amhICg2BEea1vOibJ5Calw">
-        <eAnnotations xmi:id="_amhICw2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhIDA2BEea1vOibJ5Calw" name="NoteType_Name">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIDQ2BEea1vOibJ5Calw" value="description"/>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_yETmGnkoEeanaZ15xYvgrw">
+        <eAnnotations xmi:id="_yETmG3koEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETmHHkoEeanaZ15xYvgrw" name="NoteType_Name">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmHXkoEeanaZ15xYvgrw" value="description"/>
           </contents>
         </eAnnotations>
         <body>Characterisation Model V1.13 (2008)</body>
       </ownedComment>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhIDg2BEea1vOibJ5Calw" name="Char">
-        <eAnnotations xmi:id="_amhIDw2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhIEA2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIEQ2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETmHnkoEeanaZ15xYvgrw" name="Char">
+        <eAnnotations xmi:id="_yETmH3koEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETmIHkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmIXkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:InformationItem" xmi:id="_amhIEg2BEea1vOibJ5Calw" name="Characterisation V1.13 (2008)">
-        <eAnnotations xmi:id="_amhIEw2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhIFA2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIFQ2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:InformationItem" xmi:id="_yETmInkoEeanaZ15xYvgrw" name="Characterisation V1.13 (2008)">
+        <eAnnotations xmi:id="_yETmI3koEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETmJHkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmJXkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_amhIFg2BEea1vOibJ5Calw" name="stc">
-      <eAnnotations xmi:id="_amhIFw2BEea1vOibJ5Calw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_amhIGA2BEea1vOibJ5Calw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIGQ2BEea1vOibJ5Calw" value="0"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_yETmJnkoEeanaZ15xYvgrw" name="stc">
+      <eAnnotations xmi:id="_yETmJ3koEeanaZ15xYvgrw" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_yETmKHkoEeanaZ15xYvgrw" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmKXkoEeanaZ15xYvgrw" value="0"/>
         </contents>
       </eAnnotations>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_amhIGg2BEea1vOibJ5Calw">
-        <eAnnotations xmi:id="_amhIGw2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhIHA2BEea1vOibJ5Calw" name="NoteType_Name">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIHQ2BEea1vOibJ5Calw" value="description"/>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_yETmKnkoEeanaZ15xYvgrw">
+        <eAnnotations xmi:id="_yETmK3koEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETmLHkoEeanaZ15xYvgrw" name="NoteType_Name">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmLXkoEeanaZ15xYvgrw" value="description"/>
           </contents>
         </eAnnotations>
         <body>Space-Time Coordinates (STC) Model protoype V2.0</body>
       </ownedComment>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhIHg2BEea1vOibJ5Calw" name="AstroCoordSystem">
-        <eAnnotations xmi:id="_amhIHw2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhIIA2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIIQ2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETmLnkoEeanaZ15xYvgrw" name="AstroCoordSystem">
+        <eAnnotations xmi:id="_yETmL3koEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETmMHkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmMXkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:DataType" xmi:id="_amhIIg2BEea1vOibJ5Calw" name="Position">
-        <eAnnotations xmi:id="_amhIIw2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhIJA2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIJQ2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_yETmMnkoEeanaZ15xYvgrw" name="Position">
+        <eAnnotations xmi:id="_yETmM3koEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETmNHkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmNXkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:InformationItem" xmi:id="_amhIJg2BEea1vOibJ5Calw" name="STC V2.0 Prototype (2015)">
-        <eAnnotations xmi:id="_amhIJw2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhIKA2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIKQ2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:InformationItem" xmi:id="_yETmNnkoEeanaZ15xYvgrw" name="STC V2.0 Prototype (2015)">
+        <eAnnotations xmi:id="_yETmN3koEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETmOHkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmOXkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhIKg2BEea1vOibJ5Calw" memberEnd="_amhJ6w2BEea1vOibJ5Calw _amhIKw2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhIKw2BEea1vOibJ5Calw" visibility="public" type="_amhJrQ2BEea1vOibJ5Calw" association="_amhIKg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhILA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhILQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhILg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETmOnkoEeanaZ15xYvgrw" memberEnd="_yETn83koEeanaZ15xYvgrw _yETmO3koEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETmO3koEeanaZ15xYvgrw" visibility="public" type="_yETntXkoEeanaZ15xYvgrw" association="_yETmOnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETmPHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETmPXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmPnkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhILw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIMA2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETmP3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmQHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhIMQ2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETmQXkoEeanaZ15xYvgrw"/>
         </ownedEnd>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_amhIMg2BEea1vOibJ5Calw" name="experiment">
-      <eAnnotations xmi:id="_amhIMw2BEea1vOibJ5Calw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_amhINA2BEea1vOibJ5Calw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhINQ2BEea1vOibJ5Calw" value="0"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_yETmQnkoEeanaZ15xYvgrw" name="experiment">
+      <eAnnotations xmi:id="_yETmQ3koEeanaZ15xYvgrw" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_yETmRHkoEeanaZ15xYvgrw" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmRXkoEeanaZ15xYvgrw" value="0"/>
         </contents>
       </eAnnotations>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_amhINg2BEea1vOibJ5Calw">
-        <eAnnotations xmi:id="_amhINw2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhIOA2BEea1vOibJ5Calw" name="NoteType_Name">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIOQ2BEea1vOibJ5Calw" value="description"/>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_yETmRnkoEeanaZ15xYvgrw">
+        <eAnnotations xmi:id="_yETmR3koEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETmSHkoEeanaZ15xYvgrw" name="NoteType_Name">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmSXkoEeanaZ15xYvgrw" value="description"/>
           </contents>
         </eAnnotations>
         <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="_amhIOg2BEea1vOibJ5Calw" name="Observation">
-        <eAnnotations xmi:id="_amhIOw2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhIPA2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIPQ2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETmSnkoEeanaZ15xYvgrw" name="Observation">
+        <eAnnotations xmi:id="_yETmS3koEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETmTHkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmTXkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhIPg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhIPw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhIQA2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIQQ2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETmTnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETmT3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETmUHkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmUXkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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="_amhIQg2BEea1vOibJ5Calw" name="obsConfig" visibility="public" type="_amhIlw2BEea1vOibJ5Calw" aggregation="composite" association="_amhIdw2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhIQw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhIRA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIRQ2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhIRg2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIRw2BEea1vOibJ5Calw" value="no_access"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETmUnkoEeanaZ15xYvgrw" name="obsConfig" visibility="public" type="_yETmp3koEeanaZ15xYvgrw" aggregation="composite" association="_yETmh3koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETmU3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETmVHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmVXkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETmVnkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmV3koEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhISA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhISQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhISg2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhISw2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETmWHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETmWXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETmWnkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmW3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhITA2BEea1vOibJ5Calw" name="result" visibility="public" type="_amhJrQ2BEea1vOibJ5Calw" aggregation="composite" association="_amhIfg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhITQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhITg2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhITw2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhIUA2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIUQ2BEea1vOibJ5Calw" value="no_access"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETmXHkoEeanaZ15xYvgrw" name="result" visibility="public" type="_yETntXkoEeanaZ15xYvgrw" aggregation="composite" association="_yETmjnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETmXXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETmXnkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmX3koEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETmYHkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmYXkoEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhIUg2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhIUw2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhIVA2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIVQ2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETmYnkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETmY3koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETmZHkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmZXkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>The result of an observation is zero or more Observation Datasets.
 </body>
           </ownedComment>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_amhIVg2BEea1vOibJ5Calw" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhIVw2BEea1vOibJ5Calw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yETmZnkoEeanaZ15xYvgrw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETmZ3koEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhIWA2BEea1vOibJ5Calw" name="target" visibility="public" type="_amhI2Q2BEea1vOibJ5Calw" aggregation="composite" association="_amhIhQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhIWQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhIWg2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIWw2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhIXA2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIXQ2BEea1vOibJ5Calw" value="read_write"/>
-            </contents>
-          </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhIXg2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhIXw2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhIYA2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIYQ2BEea1vOibJ5Calw" value="description"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETmaHkoEeanaZ15xYvgrw" name="target" visibility="public" type="_yETm6XkoEeanaZ15xYvgrw" aggregation="composite" association="_yETmlXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETmaXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETmankoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETma3koEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETmbHkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmbXkoEeanaZ15xYvgrw" value="read_write"/>
+            </contents>
+          </eAnnotations>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETmbnkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETmb3koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETmcHkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmcXkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhIYg2BEea1vOibJ5Calw" name="proposal" visibility="public" type="_amhJdw2BEea1vOibJ5Calw" aggregation="composite" association="_amhIjA2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhIYw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhIZA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIZQ2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhIZg2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIZw2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETmcnkoEeanaZ15xYvgrw" name="proposal" visibility="public" type="_yETnf3koEeanaZ15xYvgrw" aggregation="composite" association="_yETmnHkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETmc3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETmdHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmdXkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETmdnkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmd3koEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhIaA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhIaQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhIag2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIaw2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETmeHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETmeXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETmenkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETme3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhIbA2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETmfHkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhIbQ2BEea1vOibJ5Calw" name="observationID" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhIbg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhIbw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIcA2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETmfXkoEeanaZ15xYvgrw" name="observationID" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETmfnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETmf3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmgHkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhIcQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIcg2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETmgXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmgnkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhIcw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhIdA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhIdQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIdg2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETmg3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETmhHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETmhXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmhnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Internal ID determined by the data provide to uniquely identify the observation within the institution or entity performing the observation.
@@ -480,128 +373,128 @@
           </ownedComment>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhIdw2BEea1vOibJ5Calw" memberEnd="_amhIQg2BEea1vOibJ5Calw _amhIeA2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhIeA2BEea1vOibJ5Calw" visibility="public" type="_amhIOg2BEea1vOibJ5Calw" association="_amhIdw2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhIeQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhIeg2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIew2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETmh3koEeanaZ15xYvgrw" memberEnd="_yETmUnkoEeanaZ15xYvgrw _yETmiHkoEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETmiHkoEeanaZ15xYvgrw" visibility="public" type="_yETmSnkoEeanaZ15xYvgrw" association="_yETmh3koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETmiXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETminkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmi3koEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhIfA2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIfQ2BEea1vOibJ5Calw" value="no_access"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETmjHkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmjXkoEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhIfg2BEea1vOibJ5Calw" memberEnd="_amhITA2BEea1vOibJ5Calw _amhIfw2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhIfw2BEea1vOibJ5Calw" visibility="public" type="_amhIOg2BEea1vOibJ5Calw" association="_amhIfg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhIgA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhIgQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIgg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETmjnkoEeanaZ15xYvgrw" memberEnd="_yETmXHkoEeanaZ15xYvgrw _yETmj3koEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETmj3koEeanaZ15xYvgrw" visibility="public" type="_yETmSnkoEeanaZ15xYvgrw" association="_yETmjnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETmkHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETmkXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmknkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhIgw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIhA2BEea1vOibJ5Calw" value="no_access"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETmk3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmlHkoEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhIhQ2BEea1vOibJ5Calw" memberEnd="_amhIWA2BEea1vOibJ5Calw _amhIhg2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhIhg2BEea1vOibJ5Calw" visibility="public" type="_amhIOg2BEea1vOibJ5Calw" association="_amhIhQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhIhw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhIiA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIiQ2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETmlXkoEeanaZ15xYvgrw" memberEnd="_yETmaHkoEeanaZ15xYvgrw _yETmlnkoEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETmlnkoEeanaZ15xYvgrw" visibility="public" type="_yETmSnkoEeanaZ15xYvgrw" association="_yETmlXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETml3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETmmHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmmXkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhIig2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIiw2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETmmnkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmm3koEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhIjA2BEea1vOibJ5Calw" memberEnd="_amhIYg2BEea1vOibJ5Calw _amhIjQ2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhIjQ2BEea1vOibJ5Calw" visibility="public" type="_amhIOg2BEea1vOibJ5Calw" association="_amhIjA2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhIjg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhIjw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIkA2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETmnHkoEeanaZ15xYvgrw" memberEnd="_yETmcnkoEeanaZ15xYvgrw _yETmnXkoEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETmnXkoEeanaZ15xYvgrw" visibility="public" type="_yETmSnkoEeanaZ15xYvgrw" association="_yETmnHkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETmnnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETmn3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmoHkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhIkQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIkg2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETmoXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmonkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:InformationItem" xmi:id="_amhIkw2BEea1vOibJ5Calw" name="Hypothetical Observation Experiment Model">
-        <eAnnotations xmi:id="_amhIlA2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhIlQ2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIlg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:InformationItem" xmi:id="_yETmo3koEeanaZ15xYvgrw" name="Hypothetical Observation Experiment Model">
+        <eAnnotations xmi:id="_yETmpHkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETmpXkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmpnkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhIlw2BEea1vOibJ5Calw" name="ObsConfig">
-        <eAnnotations xmi:id="_amhImA2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhImQ2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhImg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETmp3koEeanaZ15xYvgrw" name="ObsConfig">
+        <eAnnotations xmi:id="_yETmqHkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETmqXkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmqnkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhImw2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhInA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhInQ2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIng2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETmq3koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETmrHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETmrXkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmrnkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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="_amhInw2BEea1vOibJ5Calw" name="facility" visibility="public" type="_amhJSg2BEea1vOibJ5Calw" aggregation="composite" association="_amhIyw2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhIoA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhIoQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIog2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhIow2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIpA2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETmr3koEeanaZ15xYvgrw" name="facility" visibility="public" type="_yETnWnkoEeanaZ15xYvgrw" aggregation="composite" association="_yETm23koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETmsHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETmsXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmsnkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETms3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmtHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhIpQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhIpg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhIpw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIqA2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETmtXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETmtnkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETmt3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmuHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Metadata pertaining to the facility performing the observation.
 </body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhIqQ2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETmuXkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhIqg2BEea1vOibJ5Calw" name="instrument" visibility="public" type="_amhJZQ2BEea1vOibJ5Calw" aggregation="composite" association="_amhI0g2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhIqw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhIrA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIrQ2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETmunkoEeanaZ15xYvgrw" name="instrument" visibility="public" type="_yETnbXkoEeanaZ15xYvgrw" aggregation="composite" association="_yETm4nkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETmu3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETmvHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmvXkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhIrg2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIrw2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETmvnkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmv3koEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhIsA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhIsQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhIsg2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIsw2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETmwHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETmwXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETmwnkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmw3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Metadata pertaining to the instrument used to create the data.</body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhItA2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETmxHkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhItQ2BEea1vOibJ5Calw" name="bandpass" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhItg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhItw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIuA2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETmxXkoEeanaZ15xYvgrw" name="bandpass" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETmxnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETmx3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmyHkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhIuQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIug2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETmyXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmynkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhIuw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhIvA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhIvQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIvg2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETmy3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETmzHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETmzXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETmznkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Describes the spectral domain of the observation in a very general sense.  
@@ -609,21 +502,21 @@
   This field corresponds to both the Coverage.Spectral and Coverage.Spectral.Bandpass fields of the Resource Metadata document.
 </body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhIvw2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETmz3koEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhIwA2BEea1vOibJ5Calw" name="datasource" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhIwQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhIwg2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIww2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETm0HkoEeanaZ15xYvgrw" name="datasource" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETm0XkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETm0nkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETm03koEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhIxA2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIxQ2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETm1HkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETm1XkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhIxg2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhIxw2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhIyA2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIyQ2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETm1nkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETm13koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETm2HkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETm2XkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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:
@@ -634,314 +527,301 @@
   + custom:  Custom data, as part of a specific research project.
 </body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhIyg2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETm2nkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhIyw2BEea1vOibJ5Calw" memberEnd="_amhInw2BEea1vOibJ5Calw _amhIzA2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhIzA2BEea1vOibJ5Calw" visibility="public" type="_amhIlw2BEea1vOibJ5Calw" association="_amhIyw2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhIzQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhIzg2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhIzw2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETm23koEeanaZ15xYvgrw" memberEnd="_yETmr3koEeanaZ15xYvgrw _yETm3HkoEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETm3HkoEeanaZ15xYvgrw" visibility="public" type="_yETmp3koEeanaZ15xYvgrw" association="_yETm23koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETm3XkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETm3nkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETm33koEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhI0A2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhI0Q2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETm4HkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETm4XkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhI0g2BEea1vOibJ5Calw" memberEnd="_amhIqg2BEea1vOibJ5Calw _amhI0w2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhI0w2BEea1vOibJ5Calw" visibility="public" type="_amhIlw2BEea1vOibJ5Calw" association="_amhI0g2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhI1A2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhI1Q2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhI1g2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETm4nkoEeanaZ15xYvgrw" memberEnd="_yETmunkoEeanaZ15xYvgrw _yETm43koEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETm43koEeanaZ15xYvgrw" visibility="public" type="_yETmp3koEeanaZ15xYvgrw" association="_yETm4nkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETm5HkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETm5XkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETm5nkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhI1w2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhI2A2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETm53koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETm6HkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhI2Q2BEea1vOibJ5Calw" name="BaseTarget" isAbstract="true">
-        <eAnnotations xmi:id="_amhI2g2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhI2w2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhI3A2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETm6XkoEeanaZ15xYvgrw" name="BaseTarget" isAbstract="true">
+        <eAnnotations xmi:id="_yETm6nkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETm63koEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETm7HkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhI3Q2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhI3g2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhI3w2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhI4A2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETm7XkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETm7nkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETm73koEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETm8HkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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="_amhI4Q2BEea1vOibJ5Calw" name="name" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhI4g2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhI4w2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhI5A2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhI5Q2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhI5g2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETm8XkoEeanaZ15xYvgrw" name="name" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETm8nkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETm83koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETm9HkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETm9XkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETm9nkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhI5w2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhI6A2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhI6Q2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhI6g2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETm93koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETm-HkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETm-XkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETm-nkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhI6w2BEea1vOibJ5Calw" name="description" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhI7A2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhI7Q2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhI7g2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhI7w2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhI8A2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETm-3koEeanaZ15xYvgrw" name="description" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETm_HkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETm_XkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETm_nkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETm_3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnAHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhI8Q2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhI8g2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhI8w2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhI9A2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETnAXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETnAnkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETnA3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnBHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Free form description of target.
 </body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhI9Q2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETnBXkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhI9g2BEea1vOibJ5Calw" name="position" visibility="public" type="_amhIIg2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhI9w2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhI-A2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhI-Q2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETnBnkoEeanaZ15xYvgrw" name="position" visibility="public" type="_yETmMnkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETnB3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnCHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnCXkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhI-g2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhI-w2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETnCnkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnC3koEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhI_A2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhI_Q2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhI_g2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhI_w2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETnDHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETnDXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETnDnkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnD3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhJAA2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETnEHkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhJAQ2BEea1vOibJ5Calw" name="Target">
-        <eAnnotations xmi:id="_amhJAg2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhJAw2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJBA2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETnEXkoEeanaZ15xYvgrw" name="Target">
+        <eAnnotations xmi:id="_yETnEnkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETnE3koEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnFHkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhJBQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJBg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJBw2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJCA2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETnFXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETnFnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnF3koEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnGHkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <body>General purpose Target object.</body>
         </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_amhJCQ2BEea1vOibJ5Calw" general="_amhI2Q2BEea1vOibJ5Calw"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhJCg2BEea1vOibJ5Calw" name="objectClass" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhJCw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJDA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJDQ2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJDg2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJDw2BEea1vOibJ5Calw" value="read_write"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yETnGXkoEeanaZ15xYvgrw" general="_yETm6XkoEeanaZ15xYvgrw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETnGnkoEeanaZ15xYvgrw" name="objectClass" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETnG3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnHHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnHXkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETnHnkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnH3koEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhJEA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhJEQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhJEg2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJEw2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETnIHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETnIXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETnInkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnI3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhJFA2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETnJHkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhJFQ2BEea1vOibJ5Calw" name="AstroTarget">
-        <eAnnotations xmi:id="_amhJFg2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhJFw2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJGA2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETnJXkoEeanaZ15xYvgrw" name="AstroTarget">
+        <eAnnotations xmi:id="_yETnJnkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETnJ3koEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnKHkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhJGQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJGg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJGw2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJHA2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETnKXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETnKnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnK3koEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnLHkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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="_amhJHQ2BEea1vOibJ5Calw" general="_amhI2Q2BEea1vOibJ5Calw"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhJHg2BEea1vOibJ5Calw" name="objectClass" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhJHw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJIA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJIQ2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJIg2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJIw2BEea1vOibJ5Calw" value="read_write"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yETnLXkoEeanaZ15xYvgrw" general="_yETm6XkoEeanaZ15xYvgrw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETnLnkoEeanaZ15xYvgrw" name="objectClass" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETnL3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnMHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnMXkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETnMnkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnM3koEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhJJA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhJJQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhJJg2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJJw2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETnNHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETnNXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETnNnkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnN3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhJKA2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETnOHkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhJKQ2BEea1vOibJ5Calw" name="spectralClass" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhJKg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJKw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJLA2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETnOXkoEeanaZ15xYvgrw" name="spectralClass" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETnOnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnO3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnPHkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJLQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJLg2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETnPXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnPnkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhJLw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhJMA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhJMQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJMg2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETnP3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETnQHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETnQXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnQnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhJMw2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETnQ3koEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhJNA2BEea1vOibJ5Calw" name="redshift" visibility="public" type="_amhH7g2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhJNQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJNg2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJNw2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETnRHkoEeanaZ15xYvgrw" name="redshift" visibility="public" type="_yETl1nkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETnRXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnRnkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnR3koEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJOA2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJOQ2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETnSHkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnSXkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhJOg2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhJOw2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhJPA2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJPQ2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETnSnkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETnS3koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETnTHkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnTXkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhJPg2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETnTnkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhJPw2BEea1vOibJ5Calw" name="varAmpl" visibility="public" type="_amhH7g2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhJQA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJQQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJQg2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETnT3koEeanaZ15xYvgrw" name="varAmpl" visibility="public" type="_yETl1nkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETnUHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnUXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnUnkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJQw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJRA2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETnU3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnVHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhJRQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhJRg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhJRw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJSA2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETnVXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETnVnkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETnV3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnWHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Canonical variability amplitude attributed to the target.
 </body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhJSQ2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETnWXkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhJSg2BEea1vOibJ5Calw" name="Facility">
-        <eAnnotations xmi:id="_amhJSw2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhJTA2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJTQ2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETnWnkoEeanaZ15xYvgrw" name="Facility">
+        <eAnnotations xmi:id="_yETnW3koEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETnXHkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnXXkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhJTg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJTw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJUA2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJUQ2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETnXnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETnX3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnYHkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnYXkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <body>Facility performing the observation.
 </body>
         </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_amhJUg2BEea1vOibJ5Calw" general="_amhMzQ2BEea1vOibJ5Calw"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhJUw2BEea1vOibJ5Calw" name="party" visibility="public" type="_amhNEQ2BEea1vOibJ5Calw" association="_amhJXQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJVA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJVQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJVg2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJVw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJWA2BEea1vOibJ5Calw" value="read_write"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yETnYnkoEeanaZ15xYvgrw" general="_yETq3XkoEeanaZ15xYvgrw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETnY3koEeanaZ15xYvgrw" name="party" visibility="public" type="_yETrIXkoEeanaZ15xYvgrw" association="_yETqu3koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETnZHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnZXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnZnkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETnZ3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnaHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhJWQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhJWg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhJWw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJXA2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETnaXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETnankoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETna3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnbHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Reference to the Party or Entity which is associated with this role.</body>
           </ownedComment>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhJXQ2BEea1vOibJ5Calw" memberEnd="_amhJUw2BEea1vOibJ5Calw _amhJXg2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhJXg2BEea1vOibJ5Calw" visibility="public" type="_amhJSg2BEea1vOibJ5Calw" association="_amhJXQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJXw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJYA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJYQ2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJYg2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJYw2BEea1vOibJ5Calw" value="read_write"/>
-            </contents>
-          </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhJZA2BEea1vOibJ5Calw"/>
-        </ownedEnd>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhJZQ2BEea1vOibJ5Calw" name="Instrument">
-        <eAnnotations xmi:id="_amhJZg2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhJZw2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJaA2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETnbXkoEeanaZ15xYvgrw" name="Instrument">
+        <eAnnotations xmi:id="_yETnbnkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETnb3koEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETncHkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhJaQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJag2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJaw2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJbA2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETncXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETncnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnc3koEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETndHkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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="_amhJbQ2BEea1vOibJ5Calw" name="name" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhJbg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJbw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJcA2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJcQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJcg2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETndXkoEeanaZ15xYvgrw" name="name" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETndnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnd3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETneHkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETneXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnenkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhJcw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhJdA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhJdQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJdg2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETne3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETnfHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETnfXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnfnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Name of the instrument.
@@ -949,34 +829,34 @@
           </ownedComment>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhJdw2BEea1vOibJ5Calw" name="Proposal">
-        <eAnnotations xmi:id="_amhJeA2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhJeQ2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJeg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETnf3koEeanaZ15xYvgrw" name="Proposal">
+        <eAnnotations xmi:id="_yETngHkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETngXkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETngnkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhJew2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJfA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJfQ2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJfg2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETng3koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETnhHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnhXkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnhnkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <body>Metadata related to the proposal or document which spawned the observation.
 </body>
         </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhJfw2BEea1vOibJ5Calw" name="identifier" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhJgA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJgQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJgg2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJgw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJhA2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETnh3koEeanaZ15xYvgrw" name="identifier" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETniHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETniXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETninkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETni3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnjHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhJhQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhJhg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhJhw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJiA2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETnjXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETnjnkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETnj3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnkHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Tag used to uniquely identify a particular proposal within the institution or entity.
@@ -984,33 +864,33 @@
           </ownedComment>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhJiQ2BEea1vOibJ5Calw" name="Characterisation">
-        <eAnnotations xmi:id="_amhJig2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhJiw2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJjA2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETnkXkoEeanaZ15xYvgrw" name="Characterisation">
+        <eAnnotations xmi:id="_yETnknkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETnk3koEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnlHkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhJjQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJjg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJjw2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJkA2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETnlXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETnlnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnl3koEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnmHkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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="_amhJkQ2BEea1vOibJ5Calw" general="_amhIDg2BEea1vOibJ5Calw"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yETnmXkoEeanaZ15xYvgrw" general="_yETmHnkoEeanaZ15xYvgrw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhJkg2BEea1vOibJ5Calw" name="Derived">
-        <eAnnotations xmi:id="_amhJkw2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhJlA2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJlQ2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETnmnkoEeanaZ15xYvgrw" name="Derived">
+        <eAnnotations xmi:id="_yETnm3koEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETnnHkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnnXkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhJlg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJlw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJmA2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJmQ2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETnnnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETnn3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnoHkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnoXkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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.
@@ -1018,184 +898,184 @@
 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="_amhJmg2BEea1vOibJ5Calw" name="derivedElement" visibility="public" type="_amhKKA2BEea1vOibJ5Calw" aggregation="composite" association="_amhJpg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJmw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJnA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJnQ2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJng2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJnw2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETnonkoEeanaZ15xYvgrw" name="derivedElement" visibility="public" type="_yEToMHkoEeanaZ15xYvgrw" aggregation="composite" association="_yETnrnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETno3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnpHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnpXkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETnpnkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnp3koEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhJoA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhJoQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhJog2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJow2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETnqHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETnqXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETnqnkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnq3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhJpA2BEea1vOibJ5Calw" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhJpQ2BEea1vOibJ5Calw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yETnrHkoEeanaZ15xYvgrw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETnrXkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhJpg2BEea1vOibJ5Calw" memberEnd="_amhJmg2BEea1vOibJ5Calw _amhJpw2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhJpw2BEea1vOibJ5Calw" visibility="public" type="_amhJkg2BEea1vOibJ5Calw" association="_amhJpg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJqA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJqQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJqg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETnrnkoEeanaZ15xYvgrw" memberEnd="_yETnonkoEeanaZ15xYvgrw _yETnr3koEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETnr3koEeanaZ15xYvgrw" visibility="public" type="_yETnmnkoEeanaZ15xYvgrw" association="_yETnrnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETnsHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnsXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnsnkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJqw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJrA2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETns3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETntHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhJrQ2BEea1vOibJ5Calw" name="ObsDataset" isAbstract="true">
-        <eAnnotations xmi:id="_amhJrg2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhJrw2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJsA2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETntXkoEeanaZ15xYvgrw" name="ObsDataset" isAbstract="true">
+        <eAnnotations xmi:id="_yETntnkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETnt3koEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnuHkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhJsQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJsg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJsw2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJtA2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETnuXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETnunkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnu3koEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnvHkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <body>Abstract object extending Dataset with metadata relevant to datasets derived from Observations.
 </body>
         </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_amhJtQ2BEea1vOibJ5Calw" general="_amhKfQ2BEea1vOibJ5Calw"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhJtg2BEea1vOibJ5Calw" name="target" visibility="public" type="_amhI2Q2BEea1vOibJ5Calw" association="_amhKAg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJtw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJuA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJuQ2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJug2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJuw2BEea1vOibJ5Calw" value="no_access"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yETnvXkoEeanaZ15xYvgrw" general="_yETohXkoEeanaZ15xYvgrw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETnvnkoEeanaZ15xYvgrw" name="target" visibility="public" type="_yETm6XkoEeanaZ15xYvgrw" association="_yEToCnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETnv3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnwHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnwXkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETnwnkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnw3koEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhJvA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhJvQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhJvg2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJvw2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETnxHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETnxXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETnxnkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnx3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhJwA2BEea1vOibJ5Calw" name="proposal" visibility="public" type="_amhJdw2BEea1vOibJ5Calw" association="_amhKCg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJwQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJwg2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJww2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJxA2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJxQ2BEea1vOibJ5Calw" value="no_access"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETnyHkoEeanaZ15xYvgrw" name="proposal" visibility="public" type="_yETnf3koEeanaZ15xYvgrw" association="_yEToEnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETnyXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETnynkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETny3koEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETnzHkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETnzXkoEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhJxg2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhJxw2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhJyA2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJyQ2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETnznkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETnz3koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETn0HkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETn0XkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhJyg2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETn0nkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhJyw2BEea1vOibJ5Calw" name="obsConfig" visibility="public" type="_amhIlw2BEea1vOibJ5Calw" association="_amhKEg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJzA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJzQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJzg2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETn03koEeanaZ15xYvgrw" name="obsConfig" visibility="public" type="_yETmp3koEeanaZ15xYvgrw" association="_yEToGnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETn1HkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETn1XkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETn1nkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJzw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJ0A2BEea1vOibJ5Calw" value="no_access"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETn13koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETn2HkoEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhJ0Q2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhJ0g2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhJ0w2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJ1A2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETn2XkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETn2nkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETn23koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETn3HkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Reference to ObsConfig object from Observation.  This object provides some high-level metadata related to the observation configuration.</body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhJ1Q2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETn3XkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhJ1g2BEea1vOibJ5Calw" name="characterisation" visibility="public" type="_amhJiQ2BEea1vOibJ5Calw" aggregation="composite" association="_amhKGg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJ1w2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJ2A2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJ2Q2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETn3nkoEeanaZ15xYvgrw" name="characterisation" visibility="public" type="_yETnkXkoEeanaZ15xYvgrw" aggregation="composite" association="_yEToInkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETn33koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETn4HkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETn4XkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJ2g2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJ2w2BEea1vOibJ5Calw" value="no_access"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETn4nkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETn43koEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhJ3A2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhJ3Q2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhJ3g2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJ3w2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETn5HkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETn5XkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETn5nkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETn53koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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>
           </ownedComment>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhJ4A2BEea1vOibJ5Calw" name="derived" visibility="public" type="_amhJkg2BEea1vOibJ5Calw" aggregation="composite" association="_amhKIQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJ4Q2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJ4g2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJ4w2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJ5A2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJ5Q2BEea1vOibJ5Calw" value="no_access"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETn6HkoEeanaZ15xYvgrw" name="derived" visibility="public" type="_yETnmnkoEeanaZ15xYvgrw" aggregation="composite" association="_yEToKXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETn6XkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETn6nkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETn63koEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETn7HkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETn7XkoEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhJ5g2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhJ5w2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhJ6A2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJ6Q2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETn7nkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETn73koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETn8HkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETn8XkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhJ6g2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETn8nkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhJ6w2BEea1vOibJ5Calw" name="coordSys" visibility="public" type="_amhIHg2BEea1vOibJ5Calw" association="_amhIKg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhJ7A2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJ7Q2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJ7g2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETn83koEeanaZ15xYvgrw" name="coordSys" visibility="public" type="_yETmLnkoEeanaZ15xYvgrw" association="_yETmOnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETn9HkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETn9XkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETn9nkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJ7w2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJ8A2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETn93koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETn-HkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhJ8Q2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhJ8g2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhJ8w2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJ9A2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETn-XkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETn-nkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETn-3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETn_HkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhJ9Q2BEea1vOibJ5Calw" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhJ9g2BEea1vOibJ5Calw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yETn_XkoEeanaZ15xYvgrw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETn_nkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhJ9w2BEea1vOibJ5Calw" name="calibLevel" visibility="public" type="_amhH6Q2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhJ-A2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhJ-Q2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJ-g2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhJ-w2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhJ_A2BEea1vOibJ5Calw" value="read_write"/>
-            </contents>
-          </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhJ_Q2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhJ_g2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhJ_w2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKAA2BEea1vOibJ5Calw" value="description"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETn_3koEeanaZ15xYvgrw" name="calibLevel" visibility="public" type="_yETl0XkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yEToAHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToAXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToAnkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yEToA3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToBHkoEeanaZ15xYvgrw" value="read_write"/>
+            </contents>
+          </eAnnotations>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yEToBXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yEToBnkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yEToB3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToCHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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.
@@ -1206,135 +1086,135 @@
 * 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>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhKAQ2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yEToCXkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhKAg2BEea1vOibJ5Calw" memberEnd="_amhJtg2BEea1vOibJ5Calw _amhKAw2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhKAw2BEea1vOibJ5Calw" visibility="public" type="_amhJrQ2BEea1vOibJ5Calw" association="_amhKAg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhKBA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKBQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKBg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yEToCnkoEeanaZ15xYvgrw" memberEnd="_yETnvnkoEeanaZ15xYvgrw _yEToC3koEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yEToC3koEeanaZ15xYvgrw" visibility="public" type="_yETntXkoEeanaZ15xYvgrw" association="_yEToCnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yEToDHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToDXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToDnkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKBw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKCA2BEea1vOibJ5Calw" value="no_access"/>
+            <contents xmi:type="uml:Property" xmi:id="_yEToD3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToEHkoEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhKCQ2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yEToEXkoEeanaZ15xYvgrw"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhKCg2BEea1vOibJ5Calw" memberEnd="_amhJwA2BEea1vOibJ5Calw _amhKCw2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhKCw2BEea1vOibJ5Calw" visibility="public" type="_amhJrQ2BEea1vOibJ5Calw" association="_amhKCg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhKDA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKDQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKDg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yEToEnkoEeanaZ15xYvgrw" memberEnd="_yETnyHkoEeanaZ15xYvgrw _yEToE3koEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yEToE3koEeanaZ15xYvgrw" visibility="public" type="_yETntXkoEeanaZ15xYvgrw" association="_yEToEnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yEToFHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToFXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToFnkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKDw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKEA2BEea1vOibJ5Calw" value="no_access"/>
+            <contents xmi:type="uml:Property" xmi:id="_yEToF3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToGHkoEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhKEQ2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yEToGXkoEeanaZ15xYvgrw"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhKEg2BEea1vOibJ5Calw" memberEnd="_amhJyw2BEea1vOibJ5Calw _amhKEw2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhKEw2BEea1vOibJ5Calw" visibility="public" type="_amhJrQ2BEea1vOibJ5Calw" association="_amhKEg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhKFA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKFQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKFg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yEToGnkoEeanaZ15xYvgrw" memberEnd="_yETn03koEeanaZ15xYvgrw _yEToG3koEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yEToG3koEeanaZ15xYvgrw" visibility="public" type="_yETntXkoEeanaZ15xYvgrw" association="_yEToGnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yEToHHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToHXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToHnkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKFw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKGA2BEea1vOibJ5Calw" value="no_access"/>
+            <contents xmi:type="uml:Property" xmi:id="_yEToH3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToIHkoEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhKGQ2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yEToIXkoEeanaZ15xYvgrw"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhKGg2BEea1vOibJ5Calw" memberEnd="_amhJ1g2BEea1vOibJ5Calw _amhKGw2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhKGw2BEea1vOibJ5Calw" visibility="public" type="_amhJrQ2BEea1vOibJ5Calw" association="_amhKGg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhKHA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKHQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKHg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yEToInkoEeanaZ15xYvgrw" memberEnd="_yETn3nkoEeanaZ15xYvgrw _yEToI3koEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yEToI3koEeanaZ15xYvgrw" visibility="public" type="_yETntXkoEeanaZ15xYvgrw" association="_yEToInkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yEToJHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToJXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToJnkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKHw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKIA2BEea1vOibJ5Calw" value="no_access"/>
+            <contents xmi:type="uml:Property" xmi:id="_yEToJ3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToKHkoEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhKIQ2BEea1vOibJ5Calw" memberEnd="_amhJ4A2BEea1vOibJ5Calw _amhKIg2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhKIg2BEea1vOibJ5Calw" visibility="public" type="_amhJrQ2BEea1vOibJ5Calw" association="_amhKIQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhKIw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKJA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKJQ2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yEToKXkoEeanaZ15xYvgrw" memberEnd="_yETn6HkoEeanaZ15xYvgrw _yEToKnkoEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yEToKnkoEeanaZ15xYvgrw" visibility="public" type="_yETntXkoEeanaZ15xYvgrw" association="_yEToKXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yEToK3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToLHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToLXkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKJg2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKJw2BEea1vOibJ5Calw" value="no_access"/>
+            <contents xmi:type="uml:Property" xmi:id="_yEToLnkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToL3koEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhKKA2BEea1vOibJ5Calw" name="DerivedElement" isAbstract="true">
-        <eAnnotations xmi:id="_amhKKQ2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhKKg2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKKw2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yEToMHkoEeanaZ15xYvgrw" name="DerivedElement" isAbstract="true">
+        <eAnnotations xmi:id="_yEToMXkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yEToMnkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToM3koEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhKLA2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhKLQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKLg2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKLw2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yEToNHkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yEToNXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToNnkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToN3koEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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="_amhKMA2BEea1vOibJ5Calw" name="DerivedScalar">
-        <eAnnotations xmi:id="_amhKMQ2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhKMg2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKMw2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yEToOHkoEeanaZ15xYvgrw" name="DerivedScalar">
+        <eAnnotations xmi:id="_yEToOXkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yEToOnkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToO3koEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhKNA2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhKNQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKNg2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKNw2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yEToPHkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yEToPXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToPnkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToP3koEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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="_amhKOA2BEea1vOibJ5Calw" general="_amhKKA2BEea1vOibJ5Calw"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhKOQ2BEea1vOibJ5Calw" name="name" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhKOg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKOw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKPA2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKPQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKPg2BEea1vOibJ5Calw" value="read_write"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yEToQHkoEeanaZ15xYvgrw" general="_yEToMHkoEeanaZ15xYvgrw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yEToQXkoEeanaZ15xYvgrw" name="name" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yEToQnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToQ3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToRHkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yEToRXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToRnkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhKPw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhKQA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhKQQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKQg2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yEToR3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yEToSHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yEToSXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToSnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Name identifying the derived element.</body>
           </ownedComment>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhKQw2BEea1vOibJ5Calw" name="value" visibility="public" type="_amhHoQ2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhKRA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKRQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKRg2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKRw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKSA2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yEToS3koEeanaZ15xYvgrw" name="value" visibility="public" type="_yETl9XkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yEToTHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToTXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToTnkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yEToT3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToUHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhKSQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhKSg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhKSw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKTA2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yEToUXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yEToUnkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yEToU3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToVHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Value of the derived element.
@@ -1343,160 +1223,160 @@
         </ownedAttribute>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_amhKTQ2BEea1vOibJ5Calw" name="dataset">
-      <eAnnotations xmi:id="_amhKTg2BEea1vOibJ5Calw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_amhKTw2BEea1vOibJ5Calw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKUA2BEea1vOibJ5Calw" value="0"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_yEToVXkoEeanaZ15xYvgrw" name="dataset">
+      <eAnnotations xmi:id="_yEToVnkoEeanaZ15xYvgrw" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_yEToV3koEeanaZ15xYvgrw" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToWHkoEeanaZ15xYvgrw" value="0"/>
         </contents>
       </eAnnotations>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_amhKUQ2BEea1vOibJ5Calw">
-        <eAnnotations xmi:id="_amhKUg2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhKUw2BEea1vOibJ5Calw" name="NoteType_Name">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKVA2BEea1vOibJ5Calw" value="description"/>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_yEToWXkoEeanaZ15xYvgrw">
+        <eAnnotations xmi:id="_yEToWnkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yEToW3koEeanaZ15xYvgrw" name="NoteType_Name">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToXHkoEeanaZ15xYvgrw" value="description"/>
           </contents>
         </eAnnotations>
         <body>Dataset Metadata package</body>
       </ownedComment>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhKVQ2BEea1vOibJ5Calw" name="DataModel">
-        <eAnnotations xmi:id="_amhKVg2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhKVw2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKWA2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yEToXXkoEeanaZ15xYvgrw" name="DataModel">
+        <eAnnotations xmi:id="_yEToXnkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yEToX3koEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToYHkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhKWQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhKWg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKWw2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKXA2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yEToYXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yEToYnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToY3koEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToZHkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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="_amhKXQ2BEea1vOibJ5Calw" name="name" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhKXg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKXw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKYA2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKYQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKYg2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yEToZXkoEeanaZ15xYvgrw" name="name" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yEToZnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToZ3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToaHkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yEToaXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToankoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhKYw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhKZA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhKZQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKZg2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yEToa3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETobHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETobXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETobnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhKZw2BEea1vOibJ5Calw" name="prefix" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhKaA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKaQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKag2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKaw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKbA2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETob3koEeanaZ15xYvgrw" name="prefix" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETocHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETocXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETocnkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yEToc3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETodHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhKbQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhKbg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhKbw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKcA2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETodXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETodnkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETod3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToeHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhKcQ2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yEToeXkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhKcg2BEea1vOibJ5Calw" name="URL" visibility="public" type="_amhH_Q2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhKcw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKdA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKdQ2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yEToenkoEeanaZ15xYvgrw" name="URL" visibility="public" type="_yETl5XkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yEToe3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETofHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETofXkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKdg2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKdw2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETofnkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETof3koEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhKeA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhKeQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhKeg2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKew2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETogHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETogXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETognkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETog3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>URL pointer to the XML schema associated with the model.
 </body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhKfA2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETohHkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhKfQ2BEea1vOibJ5Calw" name="Dataset" isAbstract="true">
-        <eAnnotations xmi:id="_amhKfg2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhKfw2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKgA2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETohXkoEeanaZ15xYvgrw" name="Dataset" isAbstract="true">
+        <eAnnotations xmi:id="_yETohnkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yEToh3koEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToiHkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhKgQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhKgg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKgw2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKhA2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yEToiXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yEToinkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToi3koEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETojHkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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="_amhKhQ2BEea1vOibJ5Calw" name="curation" visibility="public" type="_amhLPQ2BEea1vOibJ5Calw" aggregation="composite" association="_amhKrg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhKhg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKhw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKiA2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKiQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKig2BEea1vOibJ5Calw" value="no_access"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETojXkoEeanaZ15xYvgrw" name="curation" visibility="public" type="_yETpRXkoEeanaZ15xYvgrw" aggregation="composite" association="_yETotnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETojnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToj3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETokHkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETokXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToknkoEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhKiw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhKjA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhKjQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKjg2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETok3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETolHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETolXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETolnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Provides metadata related to the entity responsible for the curation of the dataset.
 </body>
           </ownedComment>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhKjw2BEea1vOibJ5Calw" name="dataID" visibility="public" type="_amhKvA2BEea1vOibJ5Calw" aggregation="composite" association="_amhKtQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhKkA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKkQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKkg2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKkw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKlA2BEea1vOibJ5Calw" value="no_access"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETol3koEeanaZ15xYvgrw" name="dataID" visibility="public" type="_yEToxHkoEeanaZ15xYvgrw" aggregation="composite" association="_yETovXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETomHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETomXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETomnkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETom3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETonHkoEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhKlQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhKlg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhKlw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKmA2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETonXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETonnkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETon3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETooHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhKmQ2BEea1vOibJ5Calw" name="dataProductType" visibility="public" type="_amhLow2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhKmg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKmw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKnA2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKnQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKng2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETooXkoEeanaZ15xYvgrw" name="dataProductType" visibility="public" type="_yETpq3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yEToonkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToo3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETopHkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETopXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETopnkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhKnw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhKoA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhKoQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKog2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETop3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yEToqHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yEToqXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToqnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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
@@ -1504,61 +1384,61 @@
 </body>
           </ownedComment>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhKow2BEea1vOibJ5Calw" name="dataProductSubtype" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhKpA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKpQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKpg2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKpw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKqA2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yEToq3koEeanaZ15xYvgrw" name="dataProductSubtype" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETorHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETorXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETornkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETor3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETosHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhKqQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhKqg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhKqw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKrA2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETosXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETosnkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETos3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETotHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhKrQ2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETotXkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhKrg2BEea1vOibJ5Calw" memberEnd="_amhKhQ2BEea1vOibJ5Calw _amhKrw2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhKrw2BEea1vOibJ5Calw" visibility="public" type="_amhKfQ2BEea1vOibJ5Calw" association="_amhKrg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhKsA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKsQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKsg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETotnkoEeanaZ15xYvgrw" memberEnd="_yETojXkoEeanaZ15xYvgrw _yETot3koEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETot3koEeanaZ15xYvgrw" visibility="public" type="_yETohXkoEeanaZ15xYvgrw" association="_yETotnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETouHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETouXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETounkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKsw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKtA2BEea1vOibJ5Calw" value="no_access"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETou3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETovHkoEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhKtQ2BEea1vOibJ5Calw" memberEnd="_amhKjw2BEea1vOibJ5Calw _amhKtg2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhKtg2BEea1vOibJ5Calw" visibility="public" type="_amhKfQ2BEea1vOibJ5Calw" association="_amhKtQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhKtw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKuA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKuQ2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETovXkoEeanaZ15xYvgrw" memberEnd="_yETol3koEeanaZ15xYvgrw _yETovnkoEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETovnkoEeanaZ15xYvgrw" visibility="public" type="_yETohXkoEeanaZ15xYvgrw" association="_yETovXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETov3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETowHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETowXkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKug2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKuw2BEea1vOibJ5Calw" value="no_access"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETownkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETow3koEeanaZ15xYvgrw" value="no_access"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhKvA2BEea1vOibJ5Calw" name="DataID">
-        <eAnnotations xmi:id="_amhKvQ2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhKvg2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKvw2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yEToxHkoEeanaZ15xYvgrw" name="DataID">
+        <eAnnotations xmi:id="_yEToxXkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yEToxnkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETox3koEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhKwA2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhKwQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKwg2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKww2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yEToyHkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yEToyXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToynkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToy3koEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <body>The Data Identification object (DataID) stores the dataset identifiers and other metadata typically assigned by the dataset creator.
@@ -1566,499 +1446,499 @@
 	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="_amhKxA2BEea1vOibJ5Calw" name="creator" visibility="public" type="_amhMYw2BEea1vOibJ5Calw" aggregation="composite" association="_amhLKA2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhKxQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhKxg2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKxw2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhKyA2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKyQ2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETozHkoEeanaZ15xYvgrw" name="creator" visibility="public" type="_yETqa3koEeanaZ15xYvgrw" aggregation="composite" association="_yETpMHkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETozXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yEToznkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEToz3koEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETo0HkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETo0XkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhKyg2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhKyw2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhKzA2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhKzQ2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETo0nkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETo03koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETo1HkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETo1XkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>The institution or entity which created the dataset.</body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhKzg2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETo1nkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhKzw2BEea1vOibJ5Calw" name="contributor" visibility="public" type="_amhMbA2BEea1vOibJ5Calw" aggregation="composite" association="_amhLLw2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhK0A2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhK0Q2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhK0g2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETo13koEeanaZ15xYvgrw" name="contributor" visibility="public" type="_yETqdHkoEeanaZ15xYvgrw" aggregation="composite" association="_yETpN3koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETo2HkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETo2XkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETo2nkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhK0w2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhK1A2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETo23koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETo3HkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhK1Q2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhK1g2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhK1w2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhK2A2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETo3XkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETo3nkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETo33koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETo4HkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhK2Q2BEea1vOibJ5Calw" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhK2g2BEea1vOibJ5Calw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yETo4XkoEeanaZ15xYvgrw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETo4nkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhK2w2BEea1vOibJ5Calw" name="collection" visibility="public" type="_amhMkQ2BEea1vOibJ5Calw" aggregation="composite" association="_amhLNg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhK3A2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhK3Q2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhK3g2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhK3w2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhK4A2BEea1vOibJ5Calw" value="read_write"/>
-            </contents>
-          </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhK4Q2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhK4g2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhK4w2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhK5A2BEea1vOibJ5Calw" value="description"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETo43koEeanaZ15xYvgrw" name="collection" visibility="public" type="_yETqmXkoEeanaZ15xYvgrw" aggregation="composite" association="_yETpPnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETo5HkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETo5XkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETo5nkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETo53koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETo6HkoEeanaZ15xYvgrw" value="read_write"/>
+            </contents>
+          </eAnnotations>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETo6XkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETo6nkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETo63koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETo7HkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhK5Q2BEea1vOibJ5Calw" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhK5g2BEea1vOibJ5Calw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yETo7XkoEeanaZ15xYvgrw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETo7nkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhK5w2BEea1vOibJ5Calw" name="title" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhK6A2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhK6Q2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhK6g2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhK6w2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhK7A2BEea1vOibJ5Calw" value="read_write"/>
-            </contents>
-          </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhK7Q2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhK7g2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhK7w2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhK8A2BEea1vOibJ5Calw" value="description"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETo73koEeanaZ15xYvgrw" name="title" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETo8HkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETo8XkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETo8nkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETo83koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETo9HkoEeanaZ15xYvgrw" value="read_write"/>
+            </contents>
+          </eAnnotations>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETo9XkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETo9nkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETo93koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETo-HkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>A free form string giving a title for the dataset.  (RM:Identity.Title)</body>
           </ownedComment>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhK8Q2BEea1vOibJ5Calw" name="datasetID" visibility="public" type="_amhH_Q2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhK8g2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhK8w2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhK9A2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhK9Q2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhK9g2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETo-XkoEeanaZ15xYvgrw" name="datasetID" visibility="public" type="_yETl5XkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETo-nkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETo-3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETo_HkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETo_XkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETo_nkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhK9w2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhK-A2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhK-Q2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhK-g2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETo_3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETpAHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETpAXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpAnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhK-w2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETpA3koEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhK_A2BEea1vOibJ5Calw" name="creatorDID" visibility="public" type="_amhH_Q2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhK_Q2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhK_g2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhK_w2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETpBHkoEeanaZ15xYvgrw" name="creatorDID" visibility="public" type="_yETl5XkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETpBXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpBnkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpB3koEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLAA2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLAQ2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETpCHkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpCXkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLAg2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLAw2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLBA2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLBQ2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETpCnkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETpC3koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETpDHkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpDXkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhLBg2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETpDnkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhLBw2BEea1vOibJ5Calw" name="version" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhLCA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLCQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLCg2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETpD3koEeanaZ15xYvgrw" name="version" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETpEHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpEXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpEnkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLCw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLDA2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETpE3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpFHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLDQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLDg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLDw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLEA2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETpFXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETpFnkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETpF3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpGHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhLEQ2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETpGXkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhLEg2BEea1vOibJ5Calw" name="date" visibility="public" type="_amhH-A2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhLEw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLFA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLFQ2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETpGnkoEeanaZ15xYvgrw" name="date" visibility="public" type="_yETl4HkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETpG3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpHHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpHXkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLFg2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLFw2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETpHnkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpH3koEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLGA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLGQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLGg2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLGw2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETpIHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETpIXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETpInkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpI3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Data processing or creation date (RM:Curation.Date).</body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhLHA2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETpJHkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhLHQ2BEea1vOibJ5Calw" name="creationType" visibility="public" type="_amhL2A2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhLHg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLHw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLIA2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETpJXkoEeanaZ15xYvgrw" name="creationType" visibility="public" type="_yETp4HkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETpJnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpJ3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpKHkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLIQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLIg2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETpKXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpKnkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLIw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLJA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLJQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLJg2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETpK3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETpLHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETpLXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpLnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhLJw2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETpL3koEeanaZ15xYvgrw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhLKA2BEea1vOibJ5Calw" memberEnd="_amhKxA2BEea1vOibJ5Calw _amhLKQ2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhLKQ2BEea1vOibJ5Calw" visibility="public" type="_amhKvA2BEea1vOibJ5Calw" association="_amhLKA2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhLKg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLKw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLLA2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETpMHkoEeanaZ15xYvgrw" memberEnd="_yETozHkoEeanaZ15xYvgrw _yETpMXkoEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETpMXkoEeanaZ15xYvgrw" visibility="public" type="_yEToxHkoEeanaZ15xYvgrw" association="_yETpMHkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETpMnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpM3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpNHkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLLQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLLg2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETpNXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpNnkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhLLw2BEea1vOibJ5Calw" memberEnd="_amhKzw2BEea1vOibJ5Calw _amhLMA2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhLMA2BEea1vOibJ5Calw" visibility="public" type="_amhKvA2BEea1vOibJ5Calw" association="_amhLLw2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhLMQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLMg2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLMw2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETpN3koEeanaZ15xYvgrw" memberEnd="_yETo13koEeanaZ15xYvgrw _yETpOHkoEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETpOHkoEeanaZ15xYvgrw" visibility="public" type="_yEToxHkoEeanaZ15xYvgrw" association="_yETpN3koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETpOXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpOnkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpO3koEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLNA2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLNQ2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETpPHkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpPXkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhLNg2BEea1vOibJ5Calw" memberEnd="_amhK2w2BEea1vOibJ5Calw _amhLNw2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhLNw2BEea1vOibJ5Calw" visibility="public" type="_amhKvA2BEea1vOibJ5Calw" association="_amhLNg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhLOA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLOQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLOg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETpPnkoEeanaZ15xYvgrw" memberEnd="_yETo43koEeanaZ15xYvgrw _yETpP3koEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETpP3koEeanaZ15xYvgrw" visibility="public" type="_yEToxHkoEeanaZ15xYvgrw" association="_yETpPnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETpQHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpQXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpQnkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLOw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLPA2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETpQ3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpRHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhLPQ2BEea1vOibJ5Calw" name="Curation">
-        <eAnnotations xmi:id="_amhLPg2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhLPw2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLQA2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETpRXkoEeanaZ15xYvgrw" name="Curation">
+        <eAnnotations xmi:id="_yETpRnkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETpR3koEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpSHkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhLQQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhLQg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLQw2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLRA2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETpSXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETpSnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpS3koEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpTHkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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="_amhLRQ2BEea1vOibJ5Calw" name="publisher" visibility="public" type="_amhMPA2BEea1vOibJ5Calw" aggregation="composite" association="_amhLjg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhLRg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLRw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLSA2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLSQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLSg2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETpTXkoEeanaZ15xYvgrw" name="publisher" visibility="public" type="_yETqRHkoEeanaZ15xYvgrw" aggregation="composite" association="_yETplnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETpTnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpT3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpUHkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETpUXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpUnkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLSw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLTA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLTQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLTg2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETpU3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETpVHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETpVXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpVnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>The entity making the data available.  (RM:Curation.Publisher)</body>
           </ownedComment>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhLTw2BEea1vOibJ5Calw" name="contact" visibility="public" type="_amhMUA2BEea1vOibJ5Calw" aggregation="composite" association="_amhLlQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhLUA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLUQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLUg2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLUw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLVA2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETpV3koEeanaZ15xYvgrw" name="contact" visibility="public" type="_yETqWHkoEeanaZ15xYvgrw" aggregation="composite" association="_yETpnXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETpWHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpWXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpWnkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETpW3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpXHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLVQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLVg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLVw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLWA2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETpXXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETpXnkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETpX3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpYHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhLWQ2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETpYXkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhLWg2BEea1vOibJ5Calw" name="reference" visibility="public" type="_amhMfw2BEea1vOibJ5Calw" aggregation="composite" association="_amhLnA2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhLWw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLXA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLXQ2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETpYnkoEeanaZ15xYvgrw" name="reference" visibility="public" type="_yETqh3koEeanaZ15xYvgrw" aggregation="composite" association="_yETppHkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETpY3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpZHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpZXkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLXg2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLXw2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETpZnkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpZ3koEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLYA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLYQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLYg2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLYw2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETpaHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETpaXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETpankoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpa3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhLZA2BEea1vOibJ5Calw" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhLZQ2BEea1vOibJ5Calw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yETpbHkoEeanaZ15xYvgrw" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETpbXkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhLZg2BEea1vOibJ5Calw" name="publisherDID" visibility="public" type="_amhH_Q2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhLZw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLaA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLaQ2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLag2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLaw2BEea1vOibJ5Calw" value="read_write"/>
-            </contents>
-          </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLbA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLbQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLbg2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLbw2BEea1vOibJ5Calw" value="description"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETpbnkoEeanaZ15xYvgrw" name="publisherDID" visibility="public" type="_yETl5XkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETpb3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpcHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpcXkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETpcnkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpc3koEeanaZ15xYvgrw" value="read_write"/>
+            </contents>
+          </eAnnotations>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETpdHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETpdXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETpdnkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpd3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhLcA2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETpeHkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhLcQ2BEea1vOibJ5Calw" name="version" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhLcg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLcw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLdA2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETpeXkoEeanaZ15xYvgrw" name="version" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETpenkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpe3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpfHkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLdQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLdg2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETpfXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpfnkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLdw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLeA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLeQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLeg2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETpf3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETpgHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETpgXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpgnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhLew2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETpg3koEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhLfA2BEea1vOibJ5Calw" name="releaseDate" visibility="public" type="_amhH-A2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhLfQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLfg2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLfw2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETphHkoEeanaZ15xYvgrw" name="releaseDate" visibility="public" type="_yETl4HkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETphXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETphnkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETph3koEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLgA2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLgQ2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETpiHkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpiXkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLgg2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLgw2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLhA2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLhQ2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETpinkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETpi3koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETpjHkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpjXkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Date the curated dataset was last modified.  (RM:Curation.Date)</body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhLhg2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETpjnkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhLhw2BEea1vOibJ5Calw" name="rights" visibility="public" type="_amhL_g2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhLiA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLiQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLig2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETpj3koEeanaZ15xYvgrw" name="rights" visibility="public" type="_yETqBnkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETpkHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpkXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpknkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLiw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLjA2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETpk3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETplHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhLjQ2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETplXkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhLjg2BEea1vOibJ5Calw" memberEnd="_amhLRQ2BEea1vOibJ5Calw _amhLjw2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhLjw2BEea1vOibJ5Calw" visibility="public" type="_amhLPQ2BEea1vOibJ5Calw" association="_amhLjg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhLkA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLkQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLkg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETplnkoEeanaZ15xYvgrw" memberEnd="_yETpTXkoEeanaZ15xYvgrw _yETpl3koEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETpl3koEeanaZ15xYvgrw" visibility="public" type="_yETpRXkoEeanaZ15xYvgrw" association="_yETplnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETpmHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpmXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpmnkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLkw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLlA2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETpm3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpnHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhLlQ2BEea1vOibJ5Calw" memberEnd="_amhLTw2BEea1vOibJ5Calw _amhLlg2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhLlg2BEea1vOibJ5Calw" visibility="public" type="_amhLPQ2BEea1vOibJ5Calw" association="_amhLlQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhLlw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLmA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLmQ2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETpnXkoEeanaZ15xYvgrw" memberEnd="_yETpV3koEeanaZ15xYvgrw _yETpnnkoEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETpnnkoEeanaZ15xYvgrw" visibility="public" type="_yETpRXkoEeanaZ15xYvgrw" association="_yETpnXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETpn3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpoHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpoXkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLmg2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLmw2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETponkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpo3koEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhLnA2BEea1vOibJ5Calw" memberEnd="_amhLWg2BEea1vOibJ5Calw _amhLnQ2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhLnQ2BEea1vOibJ5Calw" visibility="public" type="_amhLPQ2BEea1vOibJ5Calw" association="_amhLnA2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhLng2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLnw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLoA2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETppHkoEeanaZ15xYvgrw" memberEnd="_yETpYnkoEeanaZ15xYvgrw _yETppXkoEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETppXkoEeanaZ15xYvgrw" visibility="public" type="_yETpRXkoEeanaZ15xYvgrw" association="_yETppHkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETppnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpp3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpqHkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhLoQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLog2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETpqXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpqnkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_amhLow2BEea1vOibJ5Calw" name="DataProductType">
-        <eAnnotations xmi:id="_amhLpA2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhLpQ2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLpg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_yETpq3koEeanaZ15xYvgrw" name="DataProductType">
+        <eAnnotations xmi:id="_yETprHkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETprXkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETprnkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhLpw2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhLqA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhLqQ2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLqg2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETpr3koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETpsHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETpsXkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpsnkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <body>Enumeration identifying the high level classification of a data product.</body>
         </ownedComment>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhLqw2BEea1vOibJ5Calw" name="CUBE">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLrA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLrQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLrg2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLrw2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETps3koEeanaZ15xYvgrw" name="CUBE">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETptHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETptXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETptnkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpt3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>A multidimensional astronomical image of three (3) or more axes.
 </body>
           </ownedComment>
         </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhLsA2BEea1vOibJ5Calw" name="IMAGE">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLsQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLsg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLsw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLtA2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETpuHkoEeanaZ15xYvgrw" name="IMAGE">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETpuXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETpunkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETpu3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpvHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>A two (2) dimensional astronomical image.</body>
           </ownedComment>
         </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhLtQ2BEea1vOibJ5Calw" name="PHOTOMETRY">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLtg2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLtw2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLuA2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLuQ2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETpvXkoEeanaZ15xYvgrw" name="PHOTOMETRY">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETpvnkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETpv3koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETpwHkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpwXkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Dataset with spectral coverage with irregular gaps.
 </body>
           </ownedComment>
         </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhLug2BEea1vOibJ5Calw" name="SPECTRUM">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLuw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLvA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLvQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLvg2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETpwnkoEeanaZ15xYvgrw" name="SPECTRUM">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETpw3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETpxHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETpxXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpxnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhLvw2BEea1vOibJ5Calw" name="TIMESERIES">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLwA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLwQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLwg2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLww2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETpx3koEeanaZ15xYvgrw" name="TIMESERIES">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETpyHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETpyXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETpynkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETpy3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhLxA2BEea1vOibJ5Calw" name="SED">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLxQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLxg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLxw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLyA2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETpzHkoEeanaZ15xYvgrw" name="SED">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETpzXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETpznkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETpz3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETp0HkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhLyQ2BEea1vOibJ5Calw" name="VISIBILITY">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLyg2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhLyw2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhLzA2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhLzQ2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETp0XkoEeanaZ15xYvgrw" name="VISIBILITY">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETp0nkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETp03koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETp1HkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETp1XkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhLzg2BEea1vOibJ5Calw" name="EVENT">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhLzw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhL0A2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhL0Q2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhL0g2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETp1nkoEeanaZ15xYvgrw" name="EVENT">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETp13koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETp2HkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETp2XkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETp2nkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhL0w2BEea1vOibJ5Calw" name="CATALOG">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhL1A2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhL1Q2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhL1g2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhL1w2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETp23koEeanaZ15xYvgrw" name="CATALOG">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETp3HkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETp3XkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETp3nkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETp33koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>A catalog.
@@ -2066,258 +1946,258 @@
           </ownedComment>
         </ownedLiteral>
       </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_amhL2A2BEea1vOibJ5Calw" name="CreationType">
-        <eAnnotations xmi:id="_amhL2Q2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhL2g2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhL2w2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_yETp4HkoEeanaZ15xYvgrw" name="CreationType">
+        <eAnnotations xmi:id="_yETp4XkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETp4nkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETp43koEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhL3A2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhL3Q2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhL3g2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhL3w2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETp5HkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETp5XkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETp5nkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETp53koEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <body>Enumeration of dataset creation types.</body>
         </ownedComment>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhL4A2BEea1vOibJ5Calw" name="ARCHIVAL">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhL4Q2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhL4g2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhL4w2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhL5A2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETp6HkoEeanaZ15xYvgrw" name="ARCHIVAL">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETp6XkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETp6nkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETp63koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETp7HkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhL5Q2BEea1vOibJ5Calw" name="CUTOUT">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhL5g2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhL5w2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhL6A2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhL6Q2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETp7XkoEeanaZ15xYvgrw" name="CUTOUT">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETp7nkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETp73koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETp8HkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETp8XkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhL6g2BEea1vOibJ5Calw" name="FILTERED">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhL6w2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhL7A2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhL7Q2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhL7g2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETp8nkoEeanaZ15xYvgrw" name="FILTERED">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETp83koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETp9HkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETp9XkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETp9nkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>May involve excluding data prior to binning into samples, also "on-the-fly"
 </body>
           </ownedComment>
         </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhL7w2BEea1vOibJ5Calw" name="MOSAIC">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhL8A2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhL8Q2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhL8g2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhL8w2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETp93koEeanaZ15xYvgrw" name="MOSAIC">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETp-HkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETp-XkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETp-nkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETp-3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Combines multiple original datasets "on-the-fly"</body>
           </ownedComment>
         </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhL9A2BEea1vOibJ5Calw" name="SPECTRAL_EXTRACTION">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhL9Q2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhL9g2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhL9w2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhL-A2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETp_HkoEeanaZ15xYvgrw" name="SPECTRAL_EXTRACTION">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETp_XkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETp_nkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETp_3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqAHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Has been extracted, for example, from a spectral data cube.
 </body>
           </ownedComment>
         </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhL-Q2BEea1vOibJ5Calw" name="CATALOG_EXTRACTION">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhL-g2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhL-w2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhL_A2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhL_Q2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETqAXkoEeanaZ15xYvgrw" name="CATALOG_EXTRACTION">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETqAnkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETqA3koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETqBHkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqBXkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Has been extracted from a catalog.</body>
           </ownedComment>
         </ownedLiteral>
       </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_amhL_g2BEea1vOibJ5Calw" name="RightsType">
-        <eAnnotations xmi:id="_amhL_w2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhMAA2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMAQ2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_yETqBnkoEeanaZ15xYvgrw" name="RightsType">
+        <eAnnotations xmi:id="_yETqB3koEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETqCHkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqCXkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhMAg2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhMAw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhMBA2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMBQ2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETqCnkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETqC3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETqDHkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqDXkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <body>Enumeration of access rights levels.
 </body>
         </ownedComment>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhMBg2BEea1vOibJ5Calw" name="PUBLIC">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhMBw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhMCA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhMCQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMCg2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETqDnkoEeanaZ15xYvgrw" name="PUBLIC">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETqD3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETqEHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETqEXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqEnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>unrestricted, public access is allowed, without authentication.</body>
           </ownedComment>
         </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhMCw2BEea1vOibJ5Calw" name="PROPRIETARY">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhMDA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhMDQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhMDg2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMDw2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETqE3koEeanaZ15xYvgrw" name="PROPRIETARY">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETqFHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETqFXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETqFnkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqF3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>only proprietary access is allowed with authentication. 
 </body>
           </ownedComment>
         </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhMEA2BEea1vOibJ5Calw" name="SECURE">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhMEQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhMEg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhMEw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMFA2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETqGHkoEeanaZ15xYvgrw" name="SECURE">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETqGXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETqGnkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETqG3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqHHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>authenticated, public access is allowed.</body>
           </ownedComment>
         </ownedLiteral>
       </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_amhMFQ2BEea1vOibJ5Calw" name="SpectralBandType">
-        <eAnnotations xmi:id="_amhMFg2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhMFw2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMGA2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_yETqHXkoEeanaZ15xYvgrw" name="SpectralBandType">
+        <eAnnotations xmi:id="_yETqHnkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETqH3koEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqIHkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhMGQ2BEea1vOibJ5Calw" name="RADIO">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhMGg2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhMGw2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhMHA2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMHQ2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETqIXkoEeanaZ15xYvgrw" name="RADIO">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETqInkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETqI3koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETqJHkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqJXkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>λ ≥ 10 mm; ν ≤ 30 GHz</body>
           </ownedComment>
         </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhMHg2BEea1vOibJ5Calw" name="MILLIMETER">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhMHw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhMIA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhMIQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMIg2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETqJnkoEeanaZ15xYvgrw" name="MILLIMETER">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETqJ3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETqKHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETqKXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqKnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>0.1 mm ≤ λ ≤ 10 mm; 3000 GHz ≥ ν ≥ 30 GHz
 </body>
           </ownedComment>
         </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhMIw2BEea1vOibJ5Calw" name="INFRARED">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhMJA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhMJQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhMJg2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMJw2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETqK3koEeanaZ15xYvgrw" name="INFRARED">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETqLHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETqLXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETqLnkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqL3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>1 μ ≤ λ ≤ 100 μ</body>
           </ownedComment>
         </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhMKA2BEea1vOibJ5Calw" name="OPTICAL">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhMKQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhMKg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhMKw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMLA2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETqMHkoEeanaZ15xYvgrw" name="OPTICAL">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETqMXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETqMnkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETqM3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqNHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>0.3 μ ≤ λ ≤ 1 μ
 </body>
           </ownedComment>
         </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhMLQ2BEea1vOibJ5Calw" name="ULTRAVIOLET">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhMLg2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhMLw2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhMMA2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMMQ2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETqNXkoEeanaZ15xYvgrw" name="ULTRAVIOLET">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETqNnkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETqN3koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETqOHkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqOXkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>100 Å ≤ λ ≤ 3000 Å; 1.2 eV ≤ E ≤ 120 eV
 </body>
           </ownedComment>
         </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhMMg2BEea1vOibJ5Calw" name="XRAY">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhMMw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhMNA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhMNQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMNg2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETqOnkoEeanaZ15xYvgrw" name="XRAY">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETqO3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETqPHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETqPXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqPnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>0.1 Å ≤ λ ≤ 100 Å; 0.12 keV ≤ E ≤ 120 keV
 </body>
           </ownedComment>
         </ownedLiteral>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_amhMNw2BEea1vOibJ5Calw" name="GAMMARAY">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhMOA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhMOQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhMOg2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMOw2BEea1vOibJ5Calw" value="description"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yETqP3koEeanaZ15xYvgrw" name="GAMMARAY">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETqQHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETqQXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETqQnkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqQ3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>E ≥ 120keV</body>
           </ownedComment>
         </ownedLiteral>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhMPA2BEea1vOibJ5Calw" name="Publisher">
-        <eAnnotations xmi:id="_amhMPQ2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhMPg2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMPw2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETqRHkoEeanaZ15xYvgrw" name="Publisher">
+        <eAnnotations xmi:id="_yETqRXkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETqRnkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqR3koEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhMQA2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhMQQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhMQg2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMQw2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETqSHkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETqSXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETqSnkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqS3koEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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="_amhMRA2BEea1vOibJ5Calw" general="_amhMzQ2BEea1vOibJ5Calw"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhMRQ2BEea1vOibJ5Calw" name="publisherID" visibility="public" type="_amhH_Q2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhMRg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhMRw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMSA2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhMSQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMSg2BEea1vOibJ5Calw" value="read_write"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yETqTHkoEeanaZ15xYvgrw" general="_yETq3XkoEeanaZ15xYvgrw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETqTXkoEeanaZ15xYvgrw" name="publisherID" visibility="public" type="_yETl5XkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETqTnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETqT3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqUHkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETqUXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqUnkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhMSw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhMTA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhMTQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMTg2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETqU3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETqVHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETqVXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqVnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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="_amhMTw2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETqV3koEeanaZ15xYvgrw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhMUA2BEea1vOibJ5Calw" name="Contact">
-        <eAnnotations xmi:id="_amhMUQ2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhMUg2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMUw2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETqWHkoEeanaZ15xYvgrw" name="Contact">
+        <eAnnotations xmi:id="_yETqWXkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETqWnkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqW3koEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhMVA2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhMVQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhMVg2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMVw2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETqXHkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETqXXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETqXnkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqX3koEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <body>Contact information for a person or entity.
@@ -2325,137 +2205,137 @@
 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="_amhMWA2BEea1vOibJ5Calw" general="_amhMzQ2BEea1vOibJ5Calw"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhMWQ2BEea1vOibJ5Calw" name="party" visibility="public" type="_amhM5w2BEea1vOibJ5Calw" association="_amhMsw2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhMWg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhMWw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMXA2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhMXQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMXg2BEea1vOibJ5Calw" value="read_write"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yETqYHkoEeanaZ15xYvgrw" general="_yETq3XkoEeanaZ15xYvgrw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETqYXkoEeanaZ15xYvgrw" name="party" visibility="public" type="_yETq93koEeanaZ15xYvgrw" association="_yETqw3koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETqYnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETqY3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqZHkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETqZXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqZnkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhMXw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhMYA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhMYQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMYg2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETqZ3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETqaHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETqaXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqankoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Reference to the Individual associated with this role.</body>
           </ownedComment>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhMYw2BEea1vOibJ5Calw" name="Creator">
-        <eAnnotations xmi:id="_amhMZA2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhMZQ2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMZg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETqa3koEeanaZ15xYvgrw" name="Creator">
+        <eAnnotations xmi:id="_yETqbHkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETqbXkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqbnkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhMZw2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhMaA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhMaQ2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMag2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETqb3koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETqcHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETqcXkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqcnkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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="_amhMaw2BEea1vOibJ5Calw" general="_amhMzQ2BEea1vOibJ5Calw"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yETqc3koEeanaZ15xYvgrw" general="_yETq3XkoEeanaZ15xYvgrw"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhMbA2BEea1vOibJ5Calw" name="Contributor">
-        <eAnnotations xmi:id="_amhMbQ2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhMbg2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMbw2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETqdHkoEeanaZ15xYvgrw" name="Contributor">
+        <eAnnotations xmi:id="_yETqdXkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETqdnkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqd3koEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhMcA2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhMcQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhMcg2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMcw2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETqeHkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETqeXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETqenkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqe3koEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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="_amhMdA2BEea1vOibJ5Calw" general="_amhMzQ2BEea1vOibJ5Calw"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhMdQ2BEea1vOibJ5Calw" name="acknowledgment" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhMdg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhMdw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMeA2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhMeQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMeg2BEea1vOibJ5Calw" value="read_write"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yETqfHkoEeanaZ15xYvgrw" general="_yETq3XkoEeanaZ15xYvgrw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETqfXkoEeanaZ15xYvgrw" name="acknowledgment" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETqfnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETqf3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqgHkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETqgXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqgnkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhMew2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhMfA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhMfQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMfg2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETqg3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETqhHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETqhXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqhnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhMfw2BEea1vOibJ5Calw" name="Publication">
-        <eAnnotations xmi:id="_amhMgA2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhMgQ2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMgg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETqh3koEeanaZ15xYvgrw" name="Publication">
+        <eAnnotations xmi:id="_yETqiHkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETqiXkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqinkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhMgw2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhMhA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhMhQ2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMhg2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETqi3koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETqjHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETqjXkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqjnkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <body>Any referenceable publication associated with a Dataset.</body>
         </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhMhw2BEea1vOibJ5Calw" name="refCode" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhMiA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhMiQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMig2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhMiw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMjA2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETqj3koEeanaZ15xYvgrw" name="refCode" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETqkHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETqkXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqknkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETqk3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqlHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhMjQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhMjg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhMjw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMkA2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETqlXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETqlnkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETql3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqmHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <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>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhMkQ2BEea1vOibJ5Calw" name="Collection">
-        <eAnnotations xmi:id="_amhMkg2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhMkw2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMlA2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETqmXkoEeanaZ15xYvgrw" name="Collection">
+        <eAnnotations xmi:id="_yETqmnkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETqm3koEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqnHkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhMlQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhMlg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhMlw2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMmA2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETqnXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETqnnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETqn3koEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqoHkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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="_amhMmQ2BEea1vOibJ5Calw" name="name" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhMmg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhMmw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMnA2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhMnQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMng2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETqoXkoEeanaZ15xYvgrw" name="name" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETqonkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETqo3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqpHkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETqpXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqpnkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhMnw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhMoA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhMoQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMog2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETqp3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETqqHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETqqXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqqnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>The values are generally defined by the creating entity.  Examples: "WFC", "Sloan", "BFS Spectrograph", "MSX Galactic Plane Survey".
@@ -2464,339 +2344,346 @@
         </ownedAttribute>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:InformationItem" xmi:id="_amhMow2BEea1vOibJ5Calw" name="Dataset Metadata model with straw-man Observation model and prototype STC2.">
-      <eAnnotations xmi:id="_amhMpA2BEea1vOibJ5Calw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_amhMpQ2BEea1vOibJ5Calw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMpg2BEea1vOibJ5Calw" value="0"/>
+    <packagedElement xmi:type="uml:InformationItem" xmi:id="_yETqq3koEeanaZ15xYvgrw" name="Dataset Metadata model with straw-man Observation model and prototype STC2.">
+      <eAnnotations xmi:id="_yETqrHkoEeanaZ15xYvgrw" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_yETqrXkoEeanaZ15xYvgrw" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqrnkoEeanaZ15xYvgrw" value="0"/>
         </contents>
       </eAnnotations>
     </packagedElement>
-    <packagedElement xmi:type="uml:InformationItem" xmi:id="_amhMpw2BEea1vOibJ5Calw" name="Dataset Metadata V1.0 (2016)">
-      <eAnnotations xmi:id="_amhMqA2BEea1vOibJ5Calw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_amhMqQ2BEea1vOibJ5Calw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMqg2BEea1vOibJ5Calw" value="0"/>
+    <packagedElement xmi:type="uml:InformationItem" xmi:id="_yETqr3koEeanaZ15xYvgrw" name="Dataset Metadata V1.0 (2016)">
+      <eAnnotations xmi:id="_yETqsHkoEeanaZ15xYvgrw" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_yETqsXkoEeanaZ15xYvgrw" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqsnkoEeanaZ15xYvgrw" value="0"/>
         </contents>
       </eAnnotations>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_amhMqw2BEea1vOibJ5Calw" name="party">
-      <eAnnotations xmi:id="_amhMrA2BEea1vOibJ5Calw" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_amhMrQ2BEea1vOibJ5Calw" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMrg2BEea1vOibJ5Calw" value="0"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_yETqs3koEeanaZ15xYvgrw" name="party">
+      <eAnnotations xmi:id="_yETqtHkoEeanaZ15xYvgrw" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_yETqtXkoEeanaZ15xYvgrw" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqtnkoEeanaZ15xYvgrw" value="0"/>
         </contents>
       </eAnnotations>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_amhMrw2BEea1vOibJ5Calw">
-        <eAnnotations xmi:id="_amhMsA2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhMsQ2BEea1vOibJ5Calw" name="NoteType_Name">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMsg2BEea1vOibJ5Calw" value="description"/>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_yETqt3koEeanaZ15xYvgrw">
+        <eAnnotations xmi:id="_yETquHkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETquXkoEeanaZ15xYvgrw" name="NoteType_Name">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqunkoEeanaZ15xYvgrw" value="description"/>
           </contents>
         </eAnnotations>
         <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="_amhMsw2BEea1vOibJ5Calw" memberEnd="_amhMWQ2BEea1vOibJ5Calw _amhMtA2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhMtA2BEea1vOibJ5Calw" visibility="public" type="_amhMUA2BEea1vOibJ5Calw" association="_amhMsw2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhMtQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhMtg2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMtw2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETqu3koEeanaZ15xYvgrw" memberEnd="_yETnY3koEeanaZ15xYvgrw _yETqvHkoEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETqvHkoEeanaZ15xYvgrw" visibility="public" type="_yETnWnkoEeanaZ15xYvgrw" association="_yETqu3koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETqvXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETqvnkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqv3koEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETqwHkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqwXkoEeanaZ15xYvgrw" value="read_write"/>
+            </contents>
+          </eAnnotations>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETqwnkoEeanaZ15xYvgrw"/>
+        </ownedEnd>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETqw3koEeanaZ15xYvgrw" memberEnd="_yETqYXkoEeanaZ15xYvgrw _yETqxHkoEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETqxHkoEeanaZ15xYvgrw" visibility="public" type="_yETqWHkoEeanaZ15xYvgrw" association="_yETqw3koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETqxXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETqxnkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqx3koEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhMuA2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMuQ2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETqyHkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqyXkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhMug2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETqynkoEeanaZ15xYvgrw"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhMuw2BEea1vOibJ5Calw" name="Party" isAbstract="true">
-        <eAnnotations xmi:id="_amhMvA2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhMvQ2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMvg2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETqy3koEeanaZ15xYvgrw" name="Party" isAbstract="true">
+        <eAnnotations xmi:id="_yETqzHkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETqzXkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETqznkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhMvw2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhMwA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhMwQ2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMwg2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETqz3koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETq0HkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETq0XkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETq0nkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <body>Abstract head of the set of classes describing various entities. </body>
         </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhMww2BEea1vOibJ5Calw" name="name" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhMxA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhMxQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMxg2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhMxw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMyA2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETq03koEeanaZ15xYvgrw" name="name" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETq1HkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETq1XkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETq1nkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETq13koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETq2HkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhMyQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhMyg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhMyw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhMzA2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETq2XkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETq2nkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETq23koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETq3HkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Name of the Party or entity.  All entities are assumed to have a name.</body>
           </ownedComment>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhMzQ2BEea1vOibJ5Calw" name="Role" isAbstract="true">
-        <eAnnotations xmi:id="_amhMzg2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhMzw2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhM0A2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETq3XkoEeanaZ15xYvgrw" name="Role" isAbstract="true">
+        <eAnnotations xmi:id="_yETq3nkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETq33koEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETq4HkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhM0Q2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhM0g2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhM0w2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhM1A2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETq4XkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETq4nkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETq43koEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETq5HkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <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="_amhM1Q2BEea1vOibJ5Calw" name="party" visibility="public" type="_amhMuw2BEea1vOibJ5Calw" association="_amhM3w2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhM1g2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhM1w2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhM2A2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhM2Q2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhM2g2BEea1vOibJ5Calw" value="read_write"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETq5XkoEeanaZ15xYvgrw" name="party" visibility="public" type="_yETqy3koEeanaZ15xYvgrw" association="_yETq73koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETq5nkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETq53koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETq6HkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETq6XkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETq6nkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhM2w2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhM3A2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhM3Q2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhM3g2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETq63koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETq7HkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETq7XkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETq7nkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Reference to the Party or Entity which is associated with this role.</body>
           </ownedComment>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_amhM3w2BEea1vOibJ5Calw" memberEnd="_amhM1Q2BEea1vOibJ5Calw _amhM4A2BEea1vOibJ5Calw">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_amhM4A2BEea1vOibJ5Calw" visibility="public" type="_amhMzQ2BEea1vOibJ5Calw" association="_amhM3w2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhM4Q2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhM4g2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhM4w2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yETq73koEeanaZ15xYvgrw" memberEnd="_yETq5XkoEeanaZ15xYvgrw _yETq8HkoEeanaZ15xYvgrw">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yETq8HkoEeanaZ15xYvgrw" visibility="public" type="_yETq3XkoEeanaZ15xYvgrw" association="_yETq73koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETq8XkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETq8nkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETq83koEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhM5A2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhM5Q2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETq9HkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETq9XkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhM5g2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETq9nkoEeanaZ15xYvgrw"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhM5w2BEea1vOibJ5Calw" name="Individual">
-        <eAnnotations xmi:id="_amhM6A2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhM6Q2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhM6g2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETq93koEeanaZ15xYvgrw" name="Individual">
+        <eAnnotations xmi:id="_yETq-HkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETq-XkoEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETq-nkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhM6w2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhM7A2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhM7Q2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhM7g2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETq-3koEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETq_HkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETq_XkoEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETq_nkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <body>Abstract head of the sub-set of Parties which describe a single individual.</body>
         </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_amhM7w2BEea1vOibJ5Calw" general="_amhMuw2BEea1vOibJ5Calw"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhM8A2BEea1vOibJ5Calw" name="address" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhM8Q2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhM8g2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhM8w2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhM9A2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhM9Q2BEea1vOibJ5Calw" value="read_write"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yETq_3koEeanaZ15xYvgrw" general="_yETqy3koEeanaZ15xYvgrw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETrAHkoEeanaZ15xYvgrw" name="address" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETrAXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETrAnkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrA3koEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETrBHkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrBXkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhM9g2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhM9w2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhM-A2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhM-Q2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETrBnkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETrB3koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETrCHkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrCXkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Mailing address for the person.  The value is expressed as a single string containing all components of the address. </body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhM-g2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETrCnkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhM-w2BEea1vOibJ5Calw" name="phone" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhM_A2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhM_Q2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhM_g2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETrC3koEeanaZ15xYvgrw" name="phone" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETrDHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETrDXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrDnkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhM_w2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNAA2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETrD3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrEHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhNAQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhNAg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhNAw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNBA2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETrEXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETrEnkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETrE3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrFHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Phone number associated with the person.  The value is expressed as a string according to the format appropriate for the locale.</body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhNBQ2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETrFXkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhNBg2BEea1vOibJ5Calw" name="email" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhNBw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhNCA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNCQ2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETrFnkoEeanaZ15xYvgrw" name="email" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETrF3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETrGHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrGXkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhNCg2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNCw2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETrGnkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrG3koEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhNDA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhNDQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhNDg2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNDw2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETrHHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETrHXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETrHnkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrH3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>E-mail address of the Individual</body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhNEA2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETrIHkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_amhNEQ2BEea1vOibJ5Calw" name="Organization">
-        <eAnnotations xmi:id="_amhNEg2BEea1vOibJ5Calw" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_amhNEw2BEea1vOibJ5Calw" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNFA2BEea1vOibJ5Calw" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yETrIXkoEeanaZ15xYvgrw" name="Organization">
+        <eAnnotations xmi:id="_yETrInkoEeanaZ15xYvgrw" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yETrI3koEeanaZ15xYvgrw" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrJHkoEeanaZ15xYvgrw" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_amhNFQ2BEea1vOibJ5Calw">
-          <eAnnotations xmi:id="_amhNFg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhNFw2BEea1vOibJ5Calw" name="NoteType_Name">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNGA2BEea1vOibJ5Calw" value="description"/>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yETrJXkoEeanaZ15xYvgrw">
+          <eAnnotations xmi:id="_yETrJnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETrJ3koEeanaZ15xYvgrw" name="NoteType_Name">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrKHkoEeanaZ15xYvgrw" value="description"/>
             </contents>
           </eAnnotations>
           <body>Extension of Party for any Organization or Institution.</body>
         </ownedComment>
-        <generalization xmi:type="uml:Generalization" xmi:id="_amhNGQ2BEea1vOibJ5Calw" general="_amhMuw2BEea1vOibJ5Calw"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhNGg2BEea1vOibJ5Calw" name="address" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhNGw2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhNHA2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNHQ2BEea1vOibJ5Calw" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhNHg2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNHw2BEea1vOibJ5Calw" value="read_write"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yETrKXkoEeanaZ15xYvgrw" general="_yETqy3koEeanaZ15xYvgrw"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETrKnkoEeanaZ15xYvgrw" name="address" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETrK3koEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETrLHkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrLXkoEeanaZ15xYvgrw" value="0"/>
+            </contents>
+            <contents xmi:type="uml:Property" xmi:id="_yETrLnkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrL3koEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhNIA2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhNIQ2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhNIg2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNIw2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETrMHkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETrMXkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETrMnkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrM3koEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Mailing address.  The value is expressed as a single string containing all components of the address. 
 </body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhNJA2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETrNHkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhNJQ2BEea1vOibJ5Calw" name="phone" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhNJg2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhNJw2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNKA2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETrNXkoEeanaZ15xYvgrw" name="phone" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETrNnkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETrN3koEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrOHkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhNKQ2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNKg2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETrOXkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrOnkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhNKw2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhNLA2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhNLQ2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNLg2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETrO3koEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETrPHkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETrPXkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrPnkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>Phone number.  The value is expressed as a string according to the format appropriate for the locale.</body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhNLw2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETrP3koEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhNMA2BEea1vOibJ5Calw" name="email" visibility="public" type="_amhH3w2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhNMQ2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhNMg2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNMw2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETrQHkoEeanaZ15xYvgrw" name="email" visibility="public" type="_yETlx3koEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETrQXkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETrQnkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrQ3koEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhNNA2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNNQ2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETrRHkoEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrRXkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhNNg2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhNNw2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhNOA2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNOQ2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETrRnkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETrR3koEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETrSHkoEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrSXkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>E-mail address of the Organization.
 </body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhNOg2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETrSnkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_amhNOw2BEea1vOibJ5Calw" name="logo" visibility="public" type="_amhH_Q2BEea1vOibJ5Calw" isUnique="false">
-          <eAnnotations xmi:id="_amhNPA2BEea1vOibJ5Calw" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_amhNPQ2BEea1vOibJ5Calw" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNPg2BEea1vOibJ5Calw" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yETrS3koEeanaZ15xYvgrw" name="logo" visibility="public" type="_yETl5XkoEeanaZ15xYvgrw" isUnique="false">
+          <eAnnotations xmi:id="_yETrTHkoEeanaZ15xYvgrw" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yETrTXkoEeanaZ15xYvgrw" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrTnkoEeanaZ15xYvgrw" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_amhNPw2BEea1vOibJ5Calw" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNQA2BEea1vOibJ5Calw" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yETrT3koEeanaZ15xYvgrw" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrUHkoEeanaZ15xYvgrw" value="read_write"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_amhNQQ2BEea1vOibJ5Calw">
-            <eAnnotations xmi:id="_amhNQg2BEea1vOibJ5Calw" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_amhNQw2BEea1vOibJ5Calw" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_amhNRA2BEea1vOibJ5Calw" value="description"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yETrUXkoEeanaZ15xYvgrw">
+            <eAnnotations xmi:id="_yETrUnkoEeanaZ15xYvgrw" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yETrU3koEeanaZ15xYvgrw" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yETrVHkoEeanaZ15xYvgrw" value="description"/>
               </contents>
             </eAnnotations>
             <body>URL pointer to a graphical logo associated with the Organization.</body>
           </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_amhNRQ2BEea1vOibJ5Calw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yETrVXkoEeanaZ15xYvgrw"/>
         </ownedAttribute>
       </packagedElement>
     </packagedElement>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_amhHYA2BEea1vOibJ5Calw" xmi:id="_bBzVMA2BEea1vOibJ5Calw">
-      <eAnnotations xmi:id="_bBzVMQ2BEea1vOibJ5Calw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="IVOA_UML_Profile.profile.xmi#_anQuRw2BEea1vOibJ5Calw"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_yETlsHkoEeanaZ15xYvgrw" xmi:id="_yb3KEHkoEeanaZ15xYvgrw">
+      <eAnnotations xmi:id="_yb3KEXkoEeanaZ15xYvgrw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="IVOA_UML_Profile.profile.xmi#_yF8kd3koEeanaZ15xYvgrw"/>
       </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_bBzVMA2BEea1vOibJ5Calw" href="IVOA_UML_Profile.profile.xmi#_anQuQA2BEea1vOibJ5Calw"/>
+      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_yb3KEHkoEeanaZ15xYvgrw" href="IVOA_UML_Profile.profile.xmi#_yF8kcHkoEeanaZ15xYvgrw"/>
     </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_amhHYA2BEea1vOibJ5Calw" xmi:id="_bCQBIA2BEea1vOibJ5Calw">
-      <eAnnotations xmi:id="_bCQBIQ2BEea1vOibJ5Calw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="default.profile.xmi#_azyHVw2BEea1vOibJ5Calw"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:applyingPackage="_yETlsHkoEeanaZ15xYvgrw" xmi:id="_ycKFAHkoEeanaZ15xYvgrw">
+      <eAnnotations xmi:id="_ycKFAXkoEeanaZ15xYvgrw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="default.profile.xmi#_yRRqt3koEeanaZ15xYvgrw"/>
       </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_bCQBIA2BEea1vOibJ5Calw" href="default.profile.xmi#_azyHUA2BEea1vOibJ5Calw"/>
+      <appliedProfile xmi:type="uml:Profile" xmi:applyingPackage="_ycKFAHkoEeanaZ15xYvgrw" href="default.profile.xmi#_yRRqsHkoEeanaZ15xYvgrw"/>
     </profileApplication>
   </uml:Model>
-  <IVOA_UML_Profile:model xmi:id="_bCbAQA2BEea1vOibJ5Calw" base_Package="_amhHYA2BEea1vOibJ5Calw" title="IVOA Dataset Metadata Model" version="1.0" authors="Mark Cresitello-Dittmar, Francois Bonnarel, Omar Laurino, Gerard Lemson, Mireille Louys, Arnold Rots, Doug Tody, and the IVOA Data Model Working Group." previousVersion="0.x"/>
-  <IVOA_UML_Profile:modelimport xmi:id="_bCcOYA2BEea1vOibJ5Calw" base_Package="_amhHbw2BEea1vOibJ5Calw" name="ivoa" version="1.0" url="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml" documentationURL="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCcOYQ2BEea1vOibJ5Calw" base_NamedElement="_amhHdw2BEea1vOibJ5Calw" vodmlid="quantity"/>
-  <IVOA_UML_Profile:primitive xmi:id="_bCcOYg2BEea1vOibJ5Calw" base_DataType="_amhHew2BEea1vOibJ5Calw" base_PrimitiveType="_amhHew2BEea1vOibJ5Calw"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCcOYw2BEea1vOibJ5Calw" base_NamedElement="_amhHew2BEea1vOibJ5Calw" vodmlid="quantity.Unit"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCcOZA2BEea1vOibJ5Calw" base_NamedElement="_amhHgQ2BEea1vOibJ5Calw" vodmlid="quantity.AtomicValue"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCcOZQ2BEea1vOibJ5Calw" base_NamedElement="_amhHiw2BEea1vOibJ5Calw" vodmlid="quantity.StringValue"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCcOZg2BEea1vOibJ5Calw" base_NamedElement="_amhHlg2BEea1vOibJ5Calw" vodmlid="quantity.BooleanValue"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCcOZw2BEea1vOibJ5Calw" base_NamedElement="_amhHoQ2BEea1vOibJ5Calw" vodmlid="quantity.Quantity"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCcOaA2BEea1vOibJ5Calw" base_NamedElement="_amhHrQ2BEea1vOibJ5Calw" vodmlid="quantity.IntegerQuantity"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCcOaQ2BEea1vOibJ5Calw" base_NamedElement="_amhHuA2BEea1vOibJ5Calw" vodmlid="quantity.RealQuantity"/>
-  <IVOA_UML_Profile:primitive xmi:id="_bCcOag2BEea1vOibJ5Calw" base_DataType="_amhHww2BEea1vOibJ5Calw"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCcOaw2BEea1vOibJ5Calw" base_NamedElement="_amhHww2BEea1vOibJ5Calw" vodmlid="Identity"/>
-  <IVOA_UML_Profile:primitive xmi:id="_bCcObA2BEea1vOibJ5Calw" base_DataType="_amhH3w2BEea1vOibJ5Calw" base_PrimitiveType="_amhH3w2BEea1vOibJ5Calw"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCcObQ2BEea1vOibJ5Calw" base_NamedElement="_amhH3w2BEea1vOibJ5Calw" vodmlid="string"/>
-  <IVOA_UML_Profile:primitive xmi:id="_bCcObg2BEea1vOibJ5Calw" base_DataType="_amhH5A2BEea1vOibJ5Calw" base_PrimitiveType="_amhH5A2BEea1vOibJ5Calw"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCcObw2BEea1vOibJ5Calw" base_NamedElement="_amhH5A2BEea1vOibJ5Calw" vodmlid="boolean"/>
-  <IVOA_UML_Profile:primitive xmi:id="_bCcOcA2BEea1vOibJ5Calw" base_DataType="_amhH6Q2BEea1vOibJ5Calw" base_PrimitiveType="_amhH6Q2BEea1vOibJ5Calw"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCcOcQ2BEea1vOibJ5Calw" base_NamedElement="_amhH6Q2BEea1vOibJ5Calw" vodmlid="integer"/>
-  <IVOA_UML_Profile:primitive xmi:id="_bCcOcg2BEea1vOibJ5Calw" base_DataType="_amhH7g2BEea1vOibJ5Calw" base_PrimitiveType="_amhH7g2BEea1vOibJ5Calw"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCcOcw2BEea1vOibJ5Calw" base_NamedElement="_amhH7g2BEea1vOibJ5Calw" vodmlid="real"/>
-  <IVOA_UML_Profile:primitive xmi:id="_bCcOdA2BEea1vOibJ5Calw" base_DataType="_amhH8w2BEea1vOibJ5Calw" base_PrimitiveType="_amhH8w2BEea1vOibJ5Calw"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCcOdQ2BEea1vOibJ5Calw" base_NamedElement="_amhH8w2BEea1vOibJ5Calw" vodmlid="decimal"/>
-  <IVOA_UML_Profile:primitive xmi:id="_bCcOdg2BEea1vOibJ5Calw" base_DataType="_amhH-A2BEea1vOibJ5Calw" base_PrimitiveType="_amhH-A2BEea1vOibJ5Calw"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCcOdw2BEea1vOibJ5Calw" base_NamedElement="_amhH-A2BEea1vOibJ5Calw" vodmlid="datetime"/>
-  <IVOA_UML_Profile:primitive xmi:id="_bCcOeA2BEea1vOibJ5Calw" base_DataType="_amhH_Q2BEea1vOibJ5Calw" base_PrimitiveType="_amhH_Q2BEea1vOibJ5Calw"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCcOeQ2BEea1vOibJ5Calw" base_NamedElement="_amhH_Q2BEea1vOibJ5Calw" vodmlid="anyURI"/>
-  <IVOA_UML_Profile:modelimport xmi:id="_bCl_YA2BEea1vOibJ5Calw" base_Package="_amhIBg2BEea1vOibJ5Calw" name="char" version="1.13" url="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/characterization/Characterization.vo-dml.xml" documentationURL="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/characterization/Characterization.html"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCl_YQ2BEea1vOibJ5Calw" base_NamedElement="_amhIDg2BEea1vOibJ5Calw" vodmlid="Char"/>
-  <IVOA_UML_Profile:modelimport xmi:id="_bCl_Yg2BEea1vOibJ5Calw" base_Package="_amhIFg2BEea1vOibJ5Calw" name="stc" version="2.0" url="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/STCPrototype-2.0.vo-dml.xml" documentationURL="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/STCPrototype-2.0.html"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCl_Yw2BEea1vOibJ5Calw" base_NamedElement="_amhIHg2BEea1vOibJ5Calw" vodmlid="coordsystem.AstroCoordSystem"/>
-  <IVOA_UML_Profile:modelelement xmi:id="_bCl_ZA2BEea1vOibJ5Calw" base_NamedElement="_amhIIg2BEea1vOibJ5Calw" vodmlid="coords.Position"/>
-  <default:subset xmi:id="_bCl_ZQ2BEea1vOibJ5Calw" base_Constraint="_amhHaw2BEea1vOibJ5Calw"/>
-  <default:subset xmi:id="_bCl_Zg2BEea1vOibJ5Calw" base_Constraint="_amhHbQ2BEea1vOibJ5Calw"/>
+  <IVOA_UML_Profile:model xmi:id="_ycTO8HkoEeanaZ15xYvgrw" base_Package="_yETlsHkoEeanaZ15xYvgrw" title="IVOA Dataset Metadata Model" version="1.0" authors="Mark Cresitello-Dittmar, Francois Bonnarel, Omar Laurino, Gerard Lemson, Mireille Louys, Arnold Rots, Doug Tody, and the IVOA Data Model Working Group." previousVersion="0.x"/>
+  <IVOA_UML_Profile:modelimport xmi:id="_ycc_8HkoEeanaZ15xYvgrw" base_Package="_yETlv3koEeanaZ15xYvgrw" name="ivoa" version="1.0" url="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml" documentationURL="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html"/>
+  <IVOA_UML_Profile:primitive xmi:id="_ycc_8XkoEeanaZ15xYvgrw" base_DataType="_yETlx3koEeanaZ15xYvgrw" base_PrimitiveType="_yETlx3koEeanaZ15xYvgrw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_ycc_8nkoEeanaZ15xYvgrw" base_NamedElement="_yETlx3koEeanaZ15xYvgrw" vodmlid="string"/>
+  <IVOA_UML_Profile:primitive xmi:id="_ycc_83koEeanaZ15xYvgrw" base_DataType="_yETlzHkoEeanaZ15xYvgrw" base_PrimitiveType="_yETlzHkoEeanaZ15xYvgrw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_ycc_9HkoEeanaZ15xYvgrw" base_NamedElement="_yETlzHkoEeanaZ15xYvgrw" vodmlid="boolean"/>
+  <IVOA_UML_Profile:primitive xmi:id="_ycc_9XkoEeanaZ15xYvgrw" base_DataType="_yETl0XkoEeanaZ15xYvgrw" base_PrimitiveType="_yETl0XkoEeanaZ15xYvgrw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_ycc_9nkoEeanaZ15xYvgrw" base_NamedElement="_yETl0XkoEeanaZ15xYvgrw" vodmlid="integer"/>
+  <IVOA_UML_Profile:primitive xmi:id="_ycc_93koEeanaZ15xYvgrw" base_DataType="_yETl1nkoEeanaZ15xYvgrw" base_PrimitiveType="_yETl1nkoEeanaZ15xYvgrw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_ycc_-HkoEeanaZ15xYvgrw" base_NamedElement="_yETl1nkoEeanaZ15xYvgrw" vodmlid="real"/>
+  <IVOA_UML_Profile:primitive xmi:id="_ycc_-XkoEeanaZ15xYvgrw" base_DataType="_yETl23koEeanaZ15xYvgrw" base_PrimitiveType="_yETl23koEeanaZ15xYvgrw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_ycc_-nkoEeanaZ15xYvgrw" base_NamedElement="_yETl23koEeanaZ15xYvgrw" vodmlid="nonnegativeinteger"/>
+  <IVOA_UML_Profile:primitive xmi:id="_ycc_-3koEeanaZ15xYvgrw" base_DataType="_yETl4HkoEeanaZ15xYvgrw" base_PrimitiveType="_yETl4HkoEeanaZ15xYvgrw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_ycc__HkoEeanaZ15xYvgrw" base_NamedElement="_yETl4HkoEeanaZ15xYvgrw" vodmlid="datetime"/>
+  <IVOA_UML_Profile:primitive xmi:id="_ycc__XkoEeanaZ15xYvgrw" base_DataType="_yETl5XkoEeanaZ15xYvgrw" base_PrimitiveType="_yETl5XkoEeanaZ15xYvgrw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_ycc__nkoEeanaZ15xYvgrw" base_NamedElement="_yETl5XkoEeanaZ15xYvgrw" vodmlid="anyURI"/>
+  <IVOA_UML_Profile:primitive xmi:id="_ycc__3koEeanaZ15xYvgrw" base_DataType="_yETl73koEeanaZ15xYvgrw" base_PrimitiveType="_yETl73koEeanaZ15xYvgrw"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_ycdAAHkoEeanaZ15xYvgrw" base_NamedElement="_yETl73koEeanaZ15xYvgrw" vodmlid="Unit"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_ycdAAXkoEeanaZ15xYvgrw" base_NamedElement="_yETl9XkoEeanaZ15xYvgrw" vodmlid="Quantity"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_ycdAAnkoEeanaZ15xYvgrw" base_NamedElement="_yETmAHkoEeanaZ15xYvgrw" vodmlid="IntegerQuantity"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_ycdAA3koEeanaZ15xYvgrw" base_NamedElement="_yETmC3koEeanaZ15xYvgrw" vodmlid="RealQuantity"/>
+  <IVOA_UML_Profile:modelimport xmi:id="_ycmw8HkoEeanaZ15xYvgrw" base_Package="_yETmFnkoEeanaZ15xYvgrw" name="char" version="1.13" url="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/characterization/Characterization.vo-dml.xml" documentationURL="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/characterization/Characterization.html"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_ycmw8XkoEeanaZ15xYvgrw" base_NamedElement="_yETmHnkoEeanaZ15xYvgrw" vodmlid="Char"/>
+  <IVOA_UML_Profile:modelimport xmi:id="_ycmw8nkoEeanaZ15xYvgrw" base_Package="_yETmJnkoEeanaZ15xYvgrw" name="stc" version="2.0" url="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/STCPrototype-2.0.vo-dml.xml" documentationURL="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/STCPrototype-2.0.html"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_ycmw83koEeanaZ15xYvgrw" base_NamedElement="_yETmLnkoEeanaZ15xYvgrw" vodmlid="coordsystem.AstroCoordSystem"/>
+  <IVOA_UML_Profile:modelelement xmi:id="_ycmw9HkoEeanaZ15xYvgrw" base_NamedElement="_yETmMnkoEeanaZ15xYvgrw" vodmlid="coords.Position"/>
+  <default:subset xmi:id="_ycmw9XkoEeanaZ15xYvgrw" base_Constraint="_yETlu3koEeanaZ15xYvgrw"/>
+  <default:subset xmi:id="_ycmw9nkoEeanaZ15xYvgrw" base_Constraint="_yETlvXkoEeanaZ15xYvgrw"/>
 </xmi:XMI>


More information about the Volutecommits mailing list