[Volute] r3994 - trunk/projects/dm/CubeDM-1.0/examples

Volute commit messages volutecommits at g-vo.org
Sat Apr 29 00:32:42 CEST 2017


Author: mdittmar
Date: Sat Apr 29 00:32:42 2017
New Revision: 3994

Log:
updated examples files, added several more

Added:
   trunk/projects/dm/CubeDM-1.0/examples/error_1D_asymmetric.dtf
   trunk/projects/dm/CubeDM-1.0/examples/error_1D_asymmetric_annotated_byref.vot
   trunk/projects/dm/CubeDM-1.0/examples/error_1D_symmetric.dtf
   trunk/projects/dm/CubeDM-1.0/examples/error_1D_symmetric_annotated_byref.vot
   trunk/projects/dm/CubeDM-1.0/examples/error_2D_ellipse.dtf
   trunk/projects/dm/CubeDM-1.0/examples/error_2D_ellipse_annotated_byref.vot
   trunk/projects/dm/CubeDM-1.0/examples/error_2D_symmetric.dtf
   trunk/projects/dm/CubeDM-1.0/examples/error_2D_symmetric_annotated_byref.vot
   trunk/projects/dm/CubeDM-1.0/examples/position_fk4.dtf
   trunk/projects/dm/CubeDM-1.0/examples/position_fk4_annotated_byref.vot
   trunk/projects/dm/CubeDM-1.0/examples/position_icrs.dtf
   trunk/projects/dm/CubeDM-1.0/examples/position_icrs_annotated_byref.vot
   trunk/projects/dm/CubeDM-1.0/examples/time_date.dtf
   trunk/projects/dm/CubeDM-1.0/examples/time_date_annotated_byref.vot
   trunk/projects/dm/CubeDM-1.0/examples/time_jd.dtf
   trunk/projects/dm/CubeDM-1.0/examples/time_jd_annotated_byref.vot
   trunk/projects/dm/CubeDM-1.0/examples/time_met.dtf
   trunk/projects/dm/CubeDM-1.0/examples/time_met_annotated_byref.vot
   trunk/projects/dm/CubeDM-1.0/examples/time_mjd.dtf
   trunk/projects/dm/CubeDM-1.0/examples/time_mjd_annotated_byref.vot
   trunk/projects/dm/CubeDM-1.0/examples/timeseries_example1.dtf
   trunk/projects/dm/CubeDM-1.0/examples/timeseries_example1_annotated_byref.vot
Modified:
   trunk/projects/dm/CubeDM-1.0/examples/00README.txt
   trunk/projects/dm/CubeDM-1.0/examples/NGC_4676:I:1.4GHz:hg1996.LMV.vot
   trunk/projects/dm/CubeDM-1.0/examples/NGC_4676:I:1.4GHz:hg1996.LMV_annotated.vot
   trunk/projects/dm/CubeDM-1.0/examples/NGC_4676:I:1.4GHz:hg1996.LMV_annotated_byref.vot
   trunk/projects/dm/CubeDM-1.0/examples/chandra_2Dsky_image.vot
   trunk/projects/dm/CubeDM-1.0/examples/chandra_2Dsky_image_annotated.vot
   trunk/projects/dm/CubeDM-1.0/examples/chandra_2Dsky_image_annotated_byref.vot
   trunk/projects/dm/CubeDM-1.0/examples/chandra_events.vot
   trunk/projects/dm/CubeDM-1.0/examples/chandra_events_annotated.vot
   trunk/projects/dm/CubeDM-1.0/examples/chandra_events_annotated_byref.vot
   trunk/projects/dm/CubeDM-1.0/examples/chandra_grat_events.vot
   trunk/projects/dm/CubeDM-1.0/examples/chandra_grat_events_annotated.vot
   trunk/projects/dm/CubeDM-1.0/examples/chandra_grat_events_annotated_byref.vot

Modified: trunk/projects/dm/CubeDM-1.0/examples/00README.txt
==============================================================================
--- trunk/projects/dm/CubeDM-1.0/examples/00README.txt	Sat Apr 29 00:29:07 2017	(r3993)
+++ trunk/projects/dm/CubeDM-1.0/examples/00README.txt	Sat Apr 29 00:32:42 2017	(r3994)
@@ -1,32 +1,33 @@
 Source Files:
-  chandra_events.fits
-    Chandra L1 Event list
+  chandra_events.fits			Chandra L1 Event list
+  chandra_grat_events.fits		Chandra L2 Gratings Event list
+  chandra_2Dsky_image.fits		event list binned in sky coordinates to 2D image
+  NGC_4676:I:1.4GHz:hg1996.LMV.fits.gz	VLA 4D image cube [ 2xspatial, 1-spectral, 1-polarization ]
 
-  chandra_grat_events.fits
-    Chandra L2 Gratings Event list
-  
-  chandra_2Dsky_image.fits
-    event list binned in sky coordinates to 2D image
-  
-  NGC_4676:I:1.4GHz:hg1996.LMV.fits.gz
-    VLA 4D image cube
-      1,2 = Spatial
-      3   = Spectral
-      4   = Polarization
+  error_1D_asymmetric.dtf		Focus example - 1D Measurement with Asymmetric error
+  error_1D_symmetric.dtf		Focus example - 1D Measurement with Symmetric error
+  error_2D_ellipse.dtf			Focus example - 2D Measurement with Ellipse error
+  error_2D_symmetric.dtf		Focus example - 2D Measurement with Symmetric error
+  position_fk4.dtf			Focus example - Spatial Position in FK4
+  position_icrs.dtf			Focus example - Spatial Position in ICRS
+  time_date.dtf				Focus example - Time Measurement.. Date
+  time_jd.dtf				Focus example - Time Measurement.. Julian Date
+  time_met.dtf				Focus example - Time Measurement.. Mission ellapsed time
+  time_mjd.dtf				Focus example - Time Measurement.. MJD Date
+  timeseries_example1.dtf		Focus example - Cube as Time Series (prototyped)
 
 
 Products:
-  VOTable Representations of these sample files, serialized in 
-  agreement with IVOA Data Models:
-    + DatasetMetadata-1.0
-    + CubeDM-1.0
-    + STC2_CoordSys-2.0
-    + STC2_Coords-2.0
-    + STC2_Trans-2.0
-
-  The VOTable content of these products are serialized closely to the
-  model, and may not represent the 'typical' data provider form.  
-  However, this form is comprehensive and facilitated verifying model coverage.
+  VOTable Representations of these sample files, serialized in agreement with IVOA Data Models:
+    + DatasetMetadata-1.0 - Dataset Metadata
+    + CubeDM-1.0	  - N-Dimensional Cube 
+    + STC2_Coords-2.0	  - Astronomical Coordinates and Coordinate Systems
+    + STC2_Meas-2.0*	  - Astronomical Measurements [currently combined into Coords model]
+    + STC2_Trans-2.0	  - Transforms
+
+  The VOTable content of these products are serialized closely to the model,
+  and may not represent the 'typical' data provider form.  
+  However, this form is comprehensive and facilitates verifying model coverage.
 
   Files are named by pattern based off input filename
     <infile>.vot                 = straight VOTable translation 
@@ -34,3 +35,8 @@
     <infile>_annotated_byref.vot = VOTable with VO-DML annotations where 
                                    existing PARAMS are referenced rather
                                    than copied.
+
+  NOTE: Annotated files have flattened VOTable content.  This illustrates the 
+   mode of annotating existing VOTable data according to 1+ models.  All structure
+   is provided by the Annotation content.
+

Modified: trunk/projects/dm/CubeDM-1.0/examples/NGC_4676:I:1.4GHz:hg1996.LMV.vot
==============================================================================
--- trunk/projects/dm/CubeDM-1.0/examples/NGC_4676:I:1.4GHz:hg1996.LMV.vot	Sat Apr 29 00:29:07 2017	(r3993)
+++ trunk/projects/dm/CubeDM-1.0/examples/NGC_4676:I:1.4GHz:hg1996.LMV.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -2,14 +2,65 @@
 <VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.3">
   <RESOURCE>
     <TABLE>
-      <GROUP ID="_IPykZjnKKegGJhyB" name="TargetPosition">
-        <GROUP name="coord">
-          <PARAM name="loc" datatype="double" value="190.925"/>
-          <GROUP ref="_03t8vnIHXhUc7Hgw" name="REF_EQPOS_RA-Axis"/>
+      <GROUP ID="_0107jmoNEmJOJD1U" name="EQPOSFrame">
+        <DESCRIPTION>Physical spatial domain frame</DESCRIPTION>
+        <PARAM name="orientation" datatype="char" arraysize="4" value="ICRS"/>
+        <GROUP name="equinox">
+          <PARAM name="type" datatype="char" arraysize="1" value="B"/>
+          <PARAM name="year" datatype="double" value="1950.0"/>
+        </GROUP>
+        <GROUP name="EQPOSFrame_CoordSpace">
+          <DESCRIPTION>Spherical coordinate space</DESCRIPTION>
+          <GROUP ID="_013t8vnIHXhUc7Hg" name="EQPOS_RA-Axis">
+            <DESCRIPTION>ra axis</DESCRIPTION>
+            <PARAM name="name" datatype="char" arraysize="2" value="ra"/>
+          </GROUP>
+          <GROUP ID="_0166beYLJfS4wfge" name="EQPOS_DEC-Axis">
+            <DESCRIPTION>dec axis</DESCRIPTION>
+            <PARAM name="name" datatype="char" arraysize="3" value="dec"/>
+          </GROUP>
+        </GROUP>
+      </GROUP>
+      <GROUP ID="_102cR46CtJav0dt7" name="FELOFrame">
+        <DESCRIPTION>Physical spectral domain frame</DESCRIPTION>
+        <GROUP name="FELOFrame_CoordSpace">
+          <DESCRIPTION>1D coordinate space</DESCRIPTION>
+          <GROUP name="FELO-Axis">
+            <DESCRIPTION>felo axis</DESCRIPTION>
+            <PARAM name="name" datatype="char" arraysize="4" value="felo"/>
+          </GROUP>
         </GROUP>
+      </GROUP>
+      <GROUP ID="_20pjQotFqeWE98Pv" name="PolFrame">
+        <DESCRIPTION>Physical polarizaton domain frame</DESCRIPTION>
+        <GROUP name="PolFrame_CoordSpace">
+          <DESCRIPTION>1D coordinate space</DESCRIPTION>
+          <GROUP name="Pol-Axis">
+            <DESCRIPTION>pol axis</DESCRIPTION>
+            <PARAM name="name" datatype="char" arraysize="6" value="stokes"/>
+          </GROUP>
+        </GROUP>
+      </GROUP>
+      <GROUP ID="_30ZTlZXa2GNc1pNZ" name="GenericFrame">
+        <DESCRIPTION>Image data value frame</DESCRIPTION>
+        <GROUP name="GenericFrame_CoordSpace">
+          <DESCRIPTION>Image value coordinate space</DESCRIPTION>
+          <GROUP ID="_31rEx5xkm8kQY3t5" name="Image_CoordAxis">
+            <DESCRIPTION>Image value axis</DESCRIPTION>
+            <PARAM name="name" datatype="char" arraysize="9" value="intensity"/>
+          </GROUP>
+        </GROUP>
+      </GROUP>
+      <GROUP ID="_IPykZjnKKegGJhyB" name="TargetPosition">
         <GROUP name="coord">
-          <PARAM name="loc" datatype="double" value="31.0"/>
-          <GROUP ref="_066beYLJfS4wfge4" name="REF_EQPOS_DEC-Axis"/>
+          <GROUP name="ra">
+            <PARAM name="targ_ra" datatype="double" value="190.925"/>
+            <GROUP ref="_013t8vnIHXhUc7Hg" name="REF_EQPOS_RA-Axis"/>
+          </GROUP>
+          <GROUP name="dec">
+            <PARAM name="targ_dec" datatype="double" value="31.0"/>
+            <GROUP ref="_0166beYLJfS4wfge" name="REF_EQPOS_DEC-Axis"/>
+          </GROUP>
         </GROUP>
       </GROUP>
       <GROUP name="NDImageDataset">
@@ -44,11 +95,8 @@
             <DESCRIPTION>Target location (eg: RA, DEC)</DESCRIPTION>
           </GROUP>
         </GROUP>
-        <GROUP ref="_A9OKA8Pw7UvuTGbF" name="REF_NDImage">
-          <DESCRIPTION>Image data</DESCRIPTION>
-        </GROUP>
       </GROUP>
-      <GROUP ID="_A9OKA8Pw7UvuTGbF" name="NDImage">
+      <GROUP name="NDImage">
         <GROUP name="PixelCoordSys">
           <DESCRIPTION>Pixel Coordinate System</DESCRIPTION>
           <GROUP ID="_P2LbnHGby9C8xEXu" name="PixelFrame1">
@@ -88,58 +136,13 @@
         </GROUP>
         <GROUP name="CoordSys-Phys">
           <DESCRIPTION>Physical Coordinate System</DESCRIPTION>
-          <GROUP ID="_007jmoNEmJOJD1UJ" name="EQPOSFrame">
-            <DESCRIPTION>Physical spatial domain frame</DESCRIPTION>
-            <GROUP name="origin">
-              <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-            </GROUP>
-            <PARAM name="orientation" datatype="char" arraysize="4" value="ICRS"/>
-            <GROUP name="equinox">
-              <PARAM name="type" datatype="char" arraysize="1" value="B"/>
-              <PARAM name="year" datatype="double" value="1950.0"/>
-            </GROUP>
-            <GROUP name="EQPOSFrame_CoordSpace">
-              <DESCRIPTION>Spherical coordinate space</DESCRIPTION>
-              <GROUP ID="_03t8vnIHXhUc7Hgw" name="EQPOS_RA-Axis">
-                <DESCRIPTION>ra axis</DESCRIPTION>
-                <PARAM name="name" datatype="char" arraysize="2" value="ra"/>
-              </GROUP>
-              <GROUP ID="_066beYLJfS4wfge4" name="EQPOS_DEC-Axis">
-                <DESCRIPTION>dec axis</DESCRIPTION>
-                <PARAM name="name" datatype="char" arraysize="3" value="dec"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP ID="_102cR46CtJav0dt7" name="FELOFrame">
-            <DESCRIPTION>Physical spectral domain frame</DESCRIPTION>
-            <GROUP name="FELOFrame_CoordSpace">
-              <DESCRIPTION>1D coordinate space</DESCRIPTION>
-              <GROUP name="FELO-Axis">
-                <DESCRIPTION>felo axis</DESCRIPTION>
-                <PARAM name="name" datatype="char" arraysize="4" value="felo"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP ID="_20pjQotFqeWE98Pv" name="PolFrame">
-            <DESCRIPTION>Physical polarizaton domain frame</DESCRIPTION>
-            <GROUP name="PolFrame_CoordSpace">
-              <DESCRIPTION>1D coordinate space</DESCRIPTION>
-              <GROUP name="Pol-Axis">
-                <DESCRIPTION>pol axis</DESCRIPTION>
-                <PARAM name="name" datatype="char" arraysize="6" value="stokes"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="GenericFrame">
-            <DESCRIPTION>Image data value frame</DESCRIPTION>
-            <GROUP name="GenericFrame_CoordSpace">
-              <DESCRIPTION>Image value coordinate space</DESCRIPTION>
-              <GROUP ID="_31rEx5xkm8kQY3t5" name="Image_CoordAxis">
-                <DESCRIPTION>Image value axis</DESCRIPTION>
-                <PARAM name="name" datatype="char" arraysize="9" value="intensity"/>
-              </GROUP>
-            </GROUP>
+          <GROUP name="refPosition">
+            <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
           </GROUP>
+          <GROUP ref="_0107jmoNEmJOJD1U" name="REF_EQPOSFrame"/>
+          <GROUP ref="_102cR46CtJav0dt7" name="REF_FELOFrame"/>
+          <GROUP ref="_20pjQotFqeWE98Pv" name="REF_PolFrame"/>
+          <GROUP ref="_30ZTlZXa2GNc1pNZ" name="REF_GenericFrame"/>
         </GROUP>
         <GROUP name="Mappings">
           <DESCRIPTION>Frame Transforms</DESCRIPTION>
@@ -178,7 +181,7 @@
             <GROUP ref="_P2LbnHGby9C8xEXu" name="REF_PixelFrame1">
               <DESCRIPTION>Originating Frame (pix)</DESCRIPTION>
             </GROUP>
-            <GROUP ref="_007jmoNEmJOJD1UJ" name="REF_EQPOSFrame">
+            <GROUP ref="_0107jmoNEmJOJD1U" name="REF_EQPOSFrame">
               <DESCRIPTION>Resulting Frame (eqpos)</DESCRIPTION>
             </GROUP>
           </GROUP>
@@ -215,25 +218,25 @@
               <GROUP name="LOOKUPMAP_E1">
                 <PARAM name="nativeValue" datatype="int" value="0"/>
                 <GROUP name="targetValue">
-                  <PARAM name="loc" datatype="char" arraysize="1" value="I"/>
+                  <PARAM name="polstate" datatype="char" arraysize="1" value="I"/>
                 </GROUP>
               </GROUP>
               <GROUP name="LOOKUPMAP_E2">
                 <PARAM name="nativeValue" datatype="int" value="1"/>
                 <GROUP name="targetValue">
-                  <PARAM name="loc" datatype="char" arraysize="1" value="Q"/>
+                  <PARAM name="polstate" datatype="char" arraysize="1" value="Q"/>
                 </GROUP>
               </GROUP>
               <GROUP name="LOOKUPMAP_E3">
                 <PARAM name="nativeValue" datatype="int" value="2"/>
                 <GROUP name="targetValue">
-                  <PARAM name="loc" datatype="char" arraysize="1" value="U"/>
+                  <PARAM name="polstate" datatype="char" arraysize="1" value="U"/>
                 </GROUP>
               </GROUP>
               <GROUP name="LOOKUPMAP_E4">
                 <PARAM name="nativeValue" datatype="int" value="3"/>
                 <GROUP name="targetValue">
-                  <PARAM name="loc" datatype="char" arraysize="1" value="V"/>
+                  <PARAM name="polstate" datatype="char" arraysize="1" value="V"/>
                 </GROUP>
               </GROUP>
             </GROUP>
@@ -259,7 +262,7 @@
         </GROUP>
       </GROUP>
       <!-- Data FIELDs -->
-      <FIELD ID="_image-PRIMARY" name="PRIMARY" datatype="int"/>
+      <FIELD ID="_image-PRIMARY" name="PRIMARY" datatype="int" unit="JY/BEAM"/>
       <DATA>
         <FITS extnum="0">
           <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/NGC_4676:I:1.4GHz:hg1996.LMV.fits"/>

Modified: trunk/projects/dm/CubeDM-1.0/examples/NGC_4676:I:1.4GHz:hg1996.LMV_annotated.vot
==============================================================================
--- trunk/projects/dm/CubeDM-1.0/examples/NGC_4676:I:1.4GHz:hg1996.LMV_annotated.vot	Sat Apr 29 00:29:07 2017	(r3993)
+++ trunk/projects/dm/CubeDM-1.0/examples/NGC_4676:I:1.4GHz:hg1996.LMV_annotated.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -6,10 +6,6 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
-      <NAME>coordsys</NAME>
-      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml</URL>
-    </MODEL>
-    <MODEL>
       <NAME>cube</NAME>
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml</URL>
     </MODEL>
@@ -22,31 +18,109 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
       <NAME>trans</NAME>
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/trans/STCTrans-2.0.vo-dml.xml</URL>
     </MODEL>
     <GLOBALS>
-      <INSTANCE ID="_IPykZjnKKegGJhyB2" dmtype="coords:domain.spatial.Position2D">
-        <ATTRIBUTE dmrole="coords:domain.spatial.Position2D.coord">
-          <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-              <LITERAL dmtype="ivoa:RealQuantity" value="190.925"/>
+      <INSTANCE ID="_0107jmoNEmJOJD1U" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="ICRS"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.equinox">
+          <INSTANCE dmtype="coords:domain.spatial.Epoch">
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.type">
+              <LITERAL dmtype="coords:domain.spatial.EpochType" value="B"/>
+            </ATTRIBUTE>
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.year">
+              <LITERAL dmtype="ivoa:real" value="1950.0"/>
             </ATTRIBUTE>
-            <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-              <IDREF>_03t8vnIHXhUc7Hgw2</IDREF>
-            </REFERENCE>
           </INSTANCE>
-          <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-              <LITERAL dmtype="ivoa:RealQuantity" value="31.0"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Spherical">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_013t8vnIHXhUc7Hg" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="ra"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+              <INSTANCE ID="_0166beYLJfS4wfge" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="dec"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE ID="_102cR46CtJav0dt7" dmtype="coords:domain.spectral.SpectralFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:CoordSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="felo"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE ID="_20pjQotFqeWE98Pv" dmtype="coords:domain.polarization.PolarizationFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.polarization.PolarizationSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:DiscreteAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="stokes"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE ID="_30ZTlZXa2GNc1pNZ" dmtype="coords:domain.generic.GenericFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.generic.GenericCoordSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_31rEx5xkm8kQY3t5" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="intensity"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE ID="_IPykZjnKKegGJhyB" dmtype="meas:Position2D">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+            <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="190.925"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_013t8vnIHXhUc7Hg</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="31.0"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_0166beYLJfS4wfge</IDREF>
+                </REFERENCE>
+              </INSTANCE>
             </ATTRIBUTE>
-            <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-              <IDREF>_066beYLJfS4wfge42</IDREF>
-            </REFERENCE>
           </INSTANCE>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE dmtype="cube:NDImageDataset">
+      <INSTANCE dmtype="ds:experiment.ObsDataset">
         <ATTRIBUTE dmrole="ds:dataset.Dataset.dataProductType">
           <LITERAL dmtype="ds:dataset.DataProductType" value="IMAGE"/>
         </ATTRIBUTE>
@@ -77,35 +151,32 @@
               <LITERAL dmtype="ivoa:string" value="NGC 4676"/>
             </ATTRIBUTE>
             <REFERENCE dmrole="ds:experiment.BaseTarget.position">
-              <IDREF>_IPykZjnKKegGJhyB2</IDREF>
+              <IDREF>_IPykZjnKKegGJhyB</IDREF>
             </REFERENCE>
           </INSTANCE>
         </COMPOSITION> 
-        <REFERENCE dmrole="cube:NDImageDataset.image">
-          <IDREF>_A9OKA8Pw7UvuTGbF2</IDREF>
-        </REFERENCE>
       </INSTANCE>
-      <INSTANCE ID="_A9OKA8Pw7UvuTGbF2" dmtype="cube:NDImage">
+      <INSTANCE dmtype="cube:NDImage">
         <COMPOSITION dmrole="cube:PixelatedDataProduct.pixelCoordSys"> 
-          <INSTANCE dmtype="cube:PixelCoordSys">
-            <COMPOSITION dmrole="coordsys:PixelCoordSystem.pixelFrame"> 
-              <INSTANCE ID="_P2LbnHGby9C8xEXu2" dmtype="coordsys:domain.pixel.PixelFrame">
-                <COMPOSITION dmrole="coordsys:domain.pixel.PixelFrame.coordSpace"> 
-                  <INSTANCE dmtype="coordsys:domain.pixel.PixelSpace">
-                    <COMPOSITION dmrole="coordsys:domain.pixel.CoordSpace.axis"> 
-                      <INSTANCE dmtype="coordsys:domain.pixel.PixelAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.name">
+          <INSTANCE dmtype="coords:PixelCoordSystem">
+            <COMPOSITION dmrole="coords:PixelCoordSystem.pixelFrame"> 
+              <INSTANCE ID="_P2LbnHGby9C8xEXu" dmtype="coords:domain.pixel.PixelFrame">
+                <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+                  <INSTANCE dmtype="coords:domain.pixel.PixelSpace">
+                    <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+                      <INSTANCE dmtype="coords:domain.pixel.PixelAxis">
+                        <ATTRIBUTE dmrole="coords:Axis.name">
                           <LITERAL dmtype="ivoa:string" value="#1"/>
                         </ATTRIBUTE>
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.length">
+                        <ATTRIBUTE dmrole="coords:domain.pixel.PixelAxis.numPix">
                           <LITERAL dmtype="ivoa:nonnegativeInteger" value="512"/>
                         </ATTRIBUTE>
                       </INSTANCE>
-                      <INSTANCE dmtype="coordsys:domain.pixel.PixelAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.name">
+                      <INSTANCE dmtype="coords:domain.pixel.PixelAxis">
+                        <ATTRIBUTE dmrole="coords:Axis.name">
                           <LITERAL dmtype="ivoa:string" value="#2"/>
                         </ATTRIBUTE>
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.length">
+                        <ATTRIBUTE dmrole="coords:domain.pixel.PixelAxis.numPix">
                           <LITERAL dmtype="ivoa:nonnegativeInteger" value="512"/>
                         </ATTRIBUTE>
                       </INSTANCE>
@@ -113,15 +184,15 @@
                   </INSTANCE>
                 </COMPOSITION> 
               </INSTANCE>
-              <INSTANCE ID="_P47KgaFieYoqb2oX2" dmtype="coordsys:domain.pixel.PixelFrame">
-                <COMPOSITION dmrole="coordsys:domain.pixel.PixelFrame.coordSpace"> 
-                  <INSTANCE dmtype="coordsys:domain.pixel.PixelSpace">
-                    <COMPOSITION dmrole="coordsys:domain.pixel.CoordSpace.axis"> 
-                      <INSTANCE dmtype="coordsys:domain.pixel.PixelAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.name">
+              <INSTANCE ID="_P47KgaFieYoqb2oX" dmtype="coords:domain.pixel.PixelFrame">
+                <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+                  <INSTANCE dmtype="coords:domain.pixel.PixelSpace">
+                    <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+                      <INSTANCE dmtype="coords:domain.pixel.PixelAxis">
+                        <ATTRIBUTE dmrole="coords:Axis.name">
                           <LITERAL dmtype="ivoa:string" value="#3"/>
                         </ATTRIBUTE>
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.length">
+                        <ATTRIBUTE dmrole="coords:domain.pixel.PixelAxis.numPix">
                           <LITERAL dmtype="ivoa:nonnegativeInteger" value="26"/>
                         </ATTRIBUTE>
                       </INSTANCE>
@@ -129,15 +200,15 @@
                   </INSTANCE>
                 </COMPOSITION> 
               </INSTANCE>
-              <INSTANCE ID="_P6qMonntFCTsZzuN2" dmtype="coordsys:domain.pixel.PixelFrame">
-                <COMPOSITION dmrole="coordsys:domain.pixel.PixelFrame.coordSpace"> 
-                  <INSTANCE dmtype="coordsys:domain.pixel.PixelSpace">
-                    <COMPOSITION dmrole="coordsys:domain.pixel.CoordSpace.axis"> 
-                      <INSTANCE dmtype="coordsys:domain.pixel.PixelAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.name">
+              <INSTANCE ID="_P6qMonntFCTsZzuN" dmtype="coords:domain.pixel.PixelFrame">
+                <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+                  <INSTANCE dmtype="coords:domain.pixel.PixelSpace">
+                    <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+                      <INSTANCE dmtype="coords:domain.pixel.PixelAxis">
+                        <ATTRIBUTE dmrole="coords:Axis.name">
                           <LITERAL dmtype="ivoa:string" value="#4"/>
                         </ATTRIBUTE>
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.length">
+                        <ATTRIBUTE dmrole="coords:domain.pixel.PixelAxis.numPix">
                           <LITERAL dmtype="ivoa:nonnegativeInteger" value="1"/>
                         </ATTRIBUTE>
                       </INSTANCE>
@@ -149,92 +220,26 @@
           </INSTANCE>
         </COMPOSITION> 
         <COMPOSITION dmrole="cube:DataProduct.coordSys"> 
-          <INSTANCE dmtype="cube:CoordSys">
-            <COMPOSITION dmrole="coordsys:AstroCoordSystem.spaceFrame"> 
-              <INSTANCE ID="_007jmoNEmJOJD1UJ2" dmtype="coordsys:domain.spatial.SpaceFrame">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-                  <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-                    <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-                      <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-                    </ATTRIBUTE>
-                  </INSTANCE>
-                </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-                  <LITERAL dmtype="coordsys:domain.spatial.StdRefFrame" value="ICRS"/>
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <LITERAL dmtype="coords:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.equinox">
-                  <INSTANCE dmtype="coordsys:domain.spatial.Epoch">
-                    <ATTRIBUTE dmrole="coordsys:domain.spatial.Epoch.type">
-                      <LITERAL dmtype="coordsys:domain.spatial.EpochType" value="B"/>
-                    </ATTRIBUTE>
-                    <ATTRIBUTE dmrole="coordsys:domain.spatial.Epoch.year">
-                      <LITERAL dmtype="ivoa:real" value="1950.0"/>
-                    </ATTRIBUTE>
-                  </INSTANCE>
-                </ATTRIBUTE>
-                <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-                  <INSTANCE dmtype="coordsys:domain.spatial.Spherical">
-                    <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-                      <INSTANCE ID="_03t8vnIHXhUc7Hgw2" dmtype="coordsys:domain.spatial.CoordAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
-                          <LITERAL dmtype="ivoa:string" value="ra"/>
-                        </ATTRIBUTE>
-                      </INSTANCE>
-                      <INSTANCE ID="_066beYLJfS4wfge42" dmtype="coordsys:domain.spatial.CoordAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
-                          <LITERAL dmtype="ivoa:string" value="dec"/>
-                        </ATTRIBUTE>
-                      </INSTANCE>
-                    </COMPOSITION> 
-                  </INSTANCE>
-                </COMPOSITION> 
-              </INSTANCE>
-            </COMPOSITION> 
-            <COMPOSITION dmrole="coordsys:AstroCoordSystem.spectralFrame"> 
-              <INSTANCE ID="_102cR46CtJav0dt72" dmtype="coordsys:domain.spectral.SpectralFrame">
-                <COMPOSITION dmrole="coordsys:domain.spectral.SpectralFrame.coordSpace"> 
-                  <INSTANCE dmtype="coordsys:domain.spectral.CoordSpace1D">
-                    <COMPOSITION dmrole="coordsys:domain.spectral.CoordSpace.axis"> 
-                      <INSTANCE dmtype="coordsys:domain.spectral.CoordAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.name">
-                          <LITERAL dmtype="ivoa:string" value="felo"/>
-                        </ATTRIBUTE>
-                      </INSTANCE>
-                    </COMPOSITION> 
-                  </INSTANCE>
-                </COMPOSITION> 
               </INSTANCE>
-            </COMPOSITION> 
-            <COMPOSITION dmrole="coordsys:AstroCoordSystem.polarizationFrame"> 
-              <INSTANCE ID="_20pjQotFqeWE98Pv2" dmtype="coordsys:domain.polarization.PolarizationFrame">
-                <COMPOSITION dmrole="coordsys:domain.polarization.PolarizationFrame.coordSpace"> 
-                  <INSTANCE dmtype="coordsys:domain.polarization.CoordSpace1D">
-                    <COMPOSITION dmrole="coordsys:domain.polarization.CoordSpace.axis"> 
-                      <INSTANCE dmtype="coordsys:domain.polarization.DiscreteAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.polarization.DiscreteAxis.name">
-                          <LITERAL dmtype="ivoa:string" value="stokes"/>
-                        </ATTRIBUTE>
-                      </INSTANCE>
-                    </COMPOSITION> 
-                  </INSTANCE>
-                </COMPOSITION> 
-              </INSTANCE>
-            </COMPOSITION> 
-            <COMPOSITION dmrole="coordsys:CoordSys.genericFrame"> 
-              <INSTANCE dmtype="coordsys:domain.generic.GenericFrame">
-                <COMPOSITION dmrole="coordsys:domain.generic.GenericFrame.coordSpace"> 
-                  <INSTANCE dmtype="coordsys:domain.generic.CoordSpace1D">
-                    <COMPOSITION dmrole="coordsys:domain.generic.CoordSpace.axis"> 
-                      <INSTANCE ID="_31rEx5xkm8kQY3t52" dmtype="coordsys:domain.generic.CoordAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.generic.CoordAxis.name">
-                          <LITERAL dmtype="ivoa:string" value="intensity"/>
-                        </ATTRIBUTE>
-                      </INSTANCE>
-                    </COMPOSITION> 
-                  </INSTANCE>
-                </COMPOSITION> 
-              </INSTANCE>
-            </COMPOSITION> 
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_0107jmoNEmJOJD1U</IDREF>
+            </REFERENCE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spectralFrame">
+              <IDREF>_102cR46CtJav0dt7</IDREF>
+            </REFERENCE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.polarizationFrame">
+              <IDREF>_20pjQotFqeWE98Pv</IDREF>
+            </REFERENCE>
+            <REFERENCE dmrole="coords:CoordSys.genericFrame">
+              <IDREF>_30ZTlZXa2GNc1pNZ</IDREF>
+            </REFERENCE>
           </INSTANCE>
         </COMPOSITION> 
         <COMPOSITION dmrole="cube:DataProduct.mappings"> 
@@ -273,10 +278,10 @@
                   </INSTANCE>
                 </COMPOSITION> 
                 <REFERENCE dmrole="trans:FrameTransform.nativeFrame">
-                  <IDREF>_P2LbnHGby9C8xEXu2</IDREF>
+                  <IDREF>_P2LbnHGby9C8xEXu</IDREF>
                 </REFERENCE>
                 <REFERENCE dmrole="trans:FrameTransform.targetFrame">
-                  <IDREF>_007jmoNEmJOJD1UJ2</IDREF>
+                  <IDREF>_0107jmoNEmJOJD1U</IDREF>
                 </REFERENCE>
               </INSTANCE>
               <INSTANCE dmtype="trans:FrameTransform">
@@ -301,10 +306,10 @@
                   </INSTANCE>
                 </COMPOSITION> 
                 <REFERENCE dmrole="trans:FrameTransform.nativeFrame">
-                  <IDREF>_P47KgaFieYoqb2oX2</IDREF>
+                  <IDREF>_P47KgaFieYoqb2oX</IDREF>
                 </REFERENCE>
                 <REFERENCE dmrole="trans:FrameTransform.targetFrame">
-                  <IDREF>_102cR46CtJav0dt72</IDREF>
+                  <IDREF>_102cR46CtJav0dt7</IDREF>
                 </REFERENCE>
               </INSTANCE>
               <INSTANCE dmtype="trans:FrameTransform">
@@ -316,9 +321,9 @@
                           <LITERAL dmtype="ivoa:integer" value="0"/>
                         </ATTRIBUTE>
                         <ATTRIBUTE dmrole="trans:TPolarizationEntry.targetValue">
-                          <INSTANCE dmtype="coordsys:domain.polarization.PolStokesCoord">
-                            <ATTRIBUTE dmrole="coordsys:domain.polarization.PolStokesCoord.loc">
-                              <LITERAL dmtype="coordsys:domain.polarization.PolStokes" value="I"/>
+                          <INSTANCE dmtype="coords:domain.polarization.PolStokes">
+                            <ATTRIBUTE dmrole="coords:domain.polarization.PolStokes.cval">
+                              <LITERAL dmtype="coords:domain.polarization.PolStokesEnum" value="I"/>
                             </ATTRIBUTE>
                           </INSTANCE>
                         </ATTRIBUTE>
@@ -328,9 +333,9 @@
                           <LITERAL dmtype="ivoa:integer" value="1"/>
                         </ATTRIBUTE>
                         <ATTRIBUTE dmrole="trans:TPolarizationEntry.targetValue">
-                          <INSTANCE dmtype="coordsys:domain.polarization.PolStokesCoord">
-                            <ATTRIBUTE dmrole="coordsys:domain.polarization.PolStokesCoord.loc">
-                              <LITERAL dmtype="coordsys:domain.polarization.PolStokes" value="Q"/>
+                          <INSTANCE dmtype="coords:domain.polarization.PolStokes">
+                            <ATTRIBUTE dmrole="coords:domain.polarization.PolStokes.cval">
+                              <LITERAL dmtype="coords:domain.polarization.PolStokesEnum" value="Q"/>
                             </ATTRIBUTE>
                           </INSTANCE>
                         </ATTRIBUTE>
@@ -340,9 +345,9 @@
                           <LITERAL dmtype="ivoa:integer" value="2"/>
                         </ATTRIBUTE>
                         <ATTRIBUTE dmrole="trans:TPolarizationEntry.targetValue">
-                          <INSTANCE dmtype="coordsys:domain.polarization.PolStokesCoord">
-                            <ATTRIBUTE dmrole="coordsys:domain.polarization.PolStokesCoord.loc">
-                              <LITERAL dmtype="coordsys:domain.polarization.PolStokes" value="U"/>
+                          <INSTANCE dmtype="coords:domain.polarization.PolStokes">
+                            <ATTRIBUTE dmrole="coords:domain.polarization.PolStokes.cval">
+                              <LITERAL dmtype="coords:domain.polarization.PolStokesEnum" value="U"/>
                             </ATTRIBUTE>
                           </INSTANCE>
                         </ATTRIBUTE>
@@ -352,9 +357,9 @@
                           <LITERAL dmtype="ivoa:integer" value="3"/>
                         </ATTRIBUTE>
                         <ATTRIBUTE dmrole="trans:TPolarizationEntry.targetValue">
-                          <INSTANCE dmtype="coordsys:domain.polarization.PolStokesCoord">
-                            <ATTRIBUTE dmrole="coordsys:domain.polarization.PolStokesCoord.loc">
-                              <LITERAL dmtype="coordsys:domain.polarization.PolStokes" value="V"/>
+                          <INSTANCE dmtype="coords:domain.polarization.PolStokes">
+                            <ATTRIBUTE dmrole="coords:domain.polarization.PolStokes.cval">
+                              <LITERAL dmtype="coords:domain.polarization.PolStokesEnum" value="V"/>
                             </ATTRIBUTE>
                           </INSTANCE>
                         </ATTRIBUTE>
@@ -363,10 +368,10 @@
                   </INSTANCE>
                 </COMPOSITION> 
                 <REFERENCE dmrole="trans:FrameTransform.nativeFrame">
-                  <IDREF>_P6qMonntFCTsZzuN2</IDREF>
+                  <IDREF>_P6qMonntFCTsZzuN</IDREF>
                 </REFERENCE>
                 <REFERENCE dmrole="trans:FrameTransform.targetFrame">
-                  <IDREF>_20pjQotFqeWE98Pv2</IDREF>
+                  <IDREF>_20pjQotFqeWE98Pv</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -378,268 +383,111 @@
       </INSTANCE>
     </GLOBALS>
     <TEMPLATES tableref="_table1">
+        <INSTANCE ID="_AK9CaKnrQwqiiyvn3" dmtype="cube:Voxel">
+          <COMPOSITION dmrole="cube:DataElement.axis"> 
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="True"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:GenericCoordMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.generic.GenericCoordValue">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                        <COLUMN ref="_image-PRIMARY" dmtype="ivoa:IntegerQuantity"/>
+                      </ATTRIBUTE>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_31rEx5xkm8kQY3t5</IDREF>
+                      </REFERENCE>
+                    </INSTANCE>
+                  </ATTRIBUTE>
+                </INSTANCE>
+              </COMPOSITION> 
+            </INSTANCE>
+          </COMPOSITION> 
+        </INSTANCE>
     </TEMPLATES>
   </VODML>
   <RESOURCE>
     <TABLE ID="_table1">
-      <GROUP ID="_IPykZjnKKegGJhyB" name="TargetPosition">
-        <GROUP name="coord">
-          <PARAM name="loc" datatype="double" value="190.925"/>
-          <GROUP ref="_03t8vnIHXhUc7Hgw" name="REF_EQPOS_RA-Axis"/>
-        </GROUP>
-        <GROUP name="coord">
-          <PARAM name="loc" datatype="double" value="31.0"/>
-          <GROUP ref="_066beYLJfS4wfge4" name="REF_EQPOS_DEC-Axis"/>
-        </GROUP>
-      </GROUP>
-      <GROUP name="NDImageDataset">
-        <DESCRIPTION>N-Dimensional Image Dataset</DESCRIPTION>
-        <PARAM name="dataProductType" datatype="char" arraysize="5" ucd="meta.id" value="IMAGE">
-          <DESCRIPTION>Dataset type</DESCRIPTION>
-        </PARAM>
-        <PARAM name="dataProductSubtype" datatype="char" arraysize="18" ucd="meta.id" value="4D Pixelated Image">
-          <DESCRIPTION>Dataset subtype</DESCRIPTION>
-        </PARAM>
-        <PARAM name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
-          <DESCRIPTION>Calibration level</DESCRIPTION>
-        </PARAM>
-        <GROUP name="DataID">
-          <DESCRIPTION>Dataset identification metadata</DESCRIPTION>
-        </GROUP>
-        <GROUP name="ObsConfig">
-          <DESCRIPTION>ObsConfig Object</DESCRIPTION>
-          <GROUP name="Instrument">
-            <DESCRIPTION>Metadata for the Instrument which created the data</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="3" ucd="meta.id;instr" value="VLA">
-              <DESCRIPTION>Instrument ID</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="AstroTarget">
-          <DESCRIPTION>AstroTarget Object</DESCRIPTION>
-          <PARAM name="name" datatype="char" arraysize="8" ucd="meta.id;src" value="NGC 4676">
-            <DESCRIPTION>Target name</DESCRIPTION>
-          </PARAM>
-          <GROUP ref="_IPykZjnKKegGJhyB" name="REF_TargetPosition">
-            <DESCRIPTION>Target location (eg: RA, DEC)</DESCRIPTION>
-          </GROUP>
-        </GROUP>
-        <GROUP ref="_A9OKA8Pw7UvuTGbF" name="REF_NDImage">
-          <DESCRIPTION>Image data</DESCRIPTION>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_A9OKA8Pw7UvuTGbF" name="NDImage">
-        <GROUP name="PixelCoordSys">
-          <DESCRIPTION>Pixel Coordinate System</DESCRIPTION>
-          <GROUP ID="_P2LbnHGby9C8xEXu" name="PixelFrame1">
-            <DESCRIPTION>2D Pixel Frame</DESCRIPTION>
-            <GROUP name="PixelSpace1">
-              <DESCRIPTION>2D Coordinate Space</DESCRIPTION>
-              <GROUP name="Pixel_Axis1">
-                <PARAM name="name" datatype="char" arraysize="2" value="#1"/>
-                <PARAM name="length" datatype="long" value="512"/>
-              </GROUP>
-              <GROUP name="Pixel_Axis2">
-                <PARAM name="name" datatype="char" arraysize="2" value="#2"/>
-                <PARAM name="length" datatype="long" value="512"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP ID="_P47KgaFieYoqb2oX" name="PixelFrame2">
-            <DESCRIPTION>1D Pixel Frame</DESCRIPTION>
-            <GROUP name="PixelSpace2">
-              <DESCRIPTION>1D Coordinate Space</DESCRIPTION>
-              <GROUP name="Pixel_Axis3">
-                <PARAM name="name" datatype="char" arraysize="2" value="#3"/>
-                <PARAM name="length" datatype="long" value="26"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP ID="_P6qMonntFCTsZzuN" name="PixelFrame3">
-            <DESCRIPTION>1D Pixel Frame</DESCRIPTION>
-            <GROUP name="PixelSpace3">
-              <DESCRIPTION>1D Coordinate Space</DESCRIPTION>
-              <GROUP name="Pixel_Axis4">
-                <PARAM name="name" datatype="char" arraysize="2" value="#4"/>
-                <PARAM name="length" datatype="long" value="1"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="CoordSys-Phys">
-          <DESCRIPTION>Physical Coordinate System</DESCRIPTION>
-          <GROUP ID="_007jmoNEmJOJD1UJ" name="EQPOSFrame">
-            <DESCRIPTION>Physical spatial domain frame</DESCRIPTION>
-            <GROUP name="origin">
-              <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-            </GROUP>
-            <PARAM name="orientation" datatype="char" arraysize="4" value="ICRS"/>
-            <GROUP name="equinox">
-              <PARAM name="type" datatype="char" arraysize="1" value="B"/>
-              <PARAM name="year" datatype="double" value="1950.0"/>
-            </GROUP>
-            <GROUP name="EQPOSFrame_CoordSpace">
-              <DESCRIPTION>Spherical coordinate space</DESCRIPTION>
-              <GROUP ID="_03t8vnIHXhUc7Hgw" name="EQPOS_RA-Axis">
-                <DESCRIPTION>ra axis</DESCRIPTION>
-                <PARAM name="name" datatype="char" arraysize="2" value="ra"/>
-              </GROUP>
-              <GROUP ID="_066beYLJfS4wfge4" name="EQPOS_DEC-Axis">
-                <DESCRIPTION>dec axis</DESCRIPTION>
-                <PARAM name="name" datatype="char" arraysize="3" value="dec"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP ID="_102cR46CtJav0dt7" name="FELOFrame">
-            <DESCRIPTION>Physical spectral domain frame</DESCRIPTION>
-            <GROUP name="FELOFrame_CoordSpace">
-              <DESCRIPTION>1D coordinate space</DESCRIPTION>
-              <GROUP name="FELO-Axis">
-                <DESCRIPTION>felo axis</DESCRIPTION>
-                <PARAM name="name" datatype="char" arraysize="4" value="felo"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP ID="_20pjQotFqeWE98Pv" name="PolFrame">
-            <DESCRIPTION>Physical polarizaton domain frame</DESCRIPTION>
-            <GROUP name="PolFrame_CoordSpace">
-              <DESCRIPTION>1D coordinate space</DESCRIPTION>
-              <GROUP name="Pol-Axis">
-                <DESCRIPTION>pol axis</DESCRIPTION>
-                <PARAM name="name" datatype="char" arraysize="6" value="stokes"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="GenericFrame">
-            <DESCRIPTION>Image data value frame</DESCRIPTION>
-            <GROUP name="GenericFrame_CoordSpace">
-              <DESCRIPTION>Image value coordinate space</DESCRIPTION>
-              <GROUP ID="_31rEx5xkm8kQY3t5" name="Image_CoordAxis">
-                <DESCRIPTION>Image value axis</DESCRIPTION>
-                <PARAM name="name" datatype="char" arraysize="9" value="intensity"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Mappings">
-          <DESCRIPTION>Frame Transforms</DESCRIPTION>
-          <GROUP name="PIX2EQPOS">
-            <DESCRIPTION>Pix-to-Sky Transform</DESCRIPTION>
-            <GROUP name="PIX2EQPOS_Projection">
-              <DESCRIPTION>WCS Projection instance</DESCRIPTION>
-              <PARAM name="algorithm" datatype="char" arraysize="3" value="SIN">
-                <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
-              </PARAM>
-              <GROUP name="PIX2EQPOS_AXIS1">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM name="nativeRefValue" datatype="double" value="256.0">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="targetRefValue" datatype="double" value="190.925">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="scale" datatype="double" value="-0.001388888923">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-              <GROUP name="PIX2EQPOS_AXIS2">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM name="nativeRefValue" datatype="double" value="257.0">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="targetRefValue" datatype="double" value="31.0">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="scale" datatype="double" value="0.001388888923">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-            </GROUP>
-            <GROUP ref="_P2LbnHGby9C8xEXu" name="REF_PixelFrame1">
-              <DESCRIPTION>Originating Frame (pix)</DESCRIPTION>
-            </GROUP>
-            <GROUP ref="_007jmoNEmJOJD1UJ" name="REF_EQPOSFrame">
-              <DESCRIPTION>Resulting Frame (eqpos)</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="PIX2FELO">
-            <DESCRIPTION>Pix-to-Sky Transform</DESCRIPTION>
-            <GROUP name="PIX2FELO_Projection">
-              <DESCRIPTION>WCS Projection instance</DESCRIPTION>
-              <PARAM name="algorithm" datatype="char" arraysize="3" value="HEL">
-                <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
-              </PARAM>
-              <GROUP name="PIX2FELO_AXIS">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM name="nativeRefValue" datatype="double" value="12.0">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="targetRefValue" datatype="double" value="6750000.0">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="scale" datatype="double" value="-43104.6641">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-            </GROUP>
-            <GROUP ref="_P47KgaFieYoqb2oX" name="REF_PixelFrame2">
-              <DESCRIPTION>Originating Frame (pix)</DESCRIPTION>
-            </GROUP>
-            <GROUP ref="_102cR46CtJav0dt7" name="REF_FELOFrame">
-              <DESCRIPTION>Resulting Frame (felo)</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="PIX2STOKES">
-            <DESCRIPTION>Pix-to-Pol Transform</DESCRIPTION>
-            <GROUP name="LOOKUPMAP">
-              <GROUP name="LOOKUPMAP_E1">
-                <PARAM name="nativeValue" datatype="int" value="0"/>
-                <GROUP name="targetValue">
-                  <PARAM name="loc" datatype="char" arraysize="1" value="I"/>
-                </GROUP>
-              </GROUP>
-              <GROUP name="LOOKUPMAP_E2">
-                <PARAM name="nativeValue" datatype="int" value="1"/>
-                <GROUP name="targetValue">
-                  <PARAM name="loc" datatype="char" arraysize="1" value="Q"/>
-                </GROUP>
-              </GROUP>
-              <GROUP name="LOOKUPMAP_E3">
-                <PARAM name="nativeValue" datatype="int" value="2"/>
-                <GROUP name="targetValue">
-                  <PARAM name="loc" datatype="char" arraysize="1" value="U"/>
-                </GROUP>
-              </GROUP>
-              <GROUP name="LOOKUPMAP_E4">
-                <PARAM name="nativeValue" datatype="int" value="3"/>
-                <GROUP name="targetValue">
-                  <PARAM name="loc" datatype="char" arraysize="1" value="V"/>
-                </GROUP>
-              </GROUP>
-            </GROUP>
-            <GROUP ref="_P6qMonntFCTsZzuN" name="REF_PixelFrame3">
-              <DESCRIPTION>Originating Frame (pix)</DESCRIPTION>
-            </GROUP>
-            <GROUP ref="_20pjQotFqeWE98Pv" name="REF_PolFrame">
-              <DESCRIPTION>Resulting Frame (polarization)</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Voxel">
-          <GROUP name="ImageDataAxis">
-            <DESCRIPTION>Image voxel dependent axis</DESCRIPTION>
-            <GROUP name="ImageData">
-              <DESCRIPTION>Image voxel value (observable)</DESCRIPTION>
-              <GROUP name="coord">
-                <FIELDref ref="_image-PRIMARY"/>
-                <GROUP ref="_31rEx5xkm8kQY3t5" name="REF_Image_CoordAxis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-      </GROUP>
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM name="orientation" datatype="char" arraysize="4" value="ICRS"/>
+      <PARAM name="type" datatype="char" arraysize="1" value="B"/>
+      <PARAM name="year" datatype="double" value="1950.0"/>
+      <PARAM name="name" datatype="char" arraysize="2" value="ra"/>
+      <PARAM name="name" datatype="char" arraysize="3" value="dec"/>
+      <PARAM name="name" datatype="char" arraysize="4" value="felo"/>
+      <PARAM name="name" datatype="char" arraysize="6" value="stokes"/>
+      <PARAM name="name" datatype="char" arraysize="9" value="intensity"/>
+      <PARAM name="targ_ra" datatype="double" value="190.925"/>
+      <PARAM name="targ_dec" datatype="double" value="31.0"/>
+      <PARAM name="dataProductType" datatype="char" arraysize="5" ucd="meta.id" value="IMAGE">
+        <DESCRIPTION>Dataset type</DESCRIPTION>
+      </PARAM>
+      <PARAM name="dataProductSubtype" datatype="char" arraysize="18" ucd="meta.id" value="4D Pixelated Image">
+        <DESCRIPTION>Dataset subtype</DESCRIPTION>
+      </PARAM>
+      <PARAM name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
+        <DESCRIPTION>Calibration level</DESCRIPTION>
+      </PARAM>
+      <PARAM name="name" datatype="char" arraysize="3" ucd="meta.id;instr" value="VLA">
+        <DESCRIPTION>Instrument ID</DESCRIPTION>
+      </PARAM>
+      <PARAM name="name" datatype="char" arraysize="8" ucd="meta.id;src" value="NGC 4676">
+        <DESCRIPTION>Target name</DESCRIPTION>
+      </PARAM>
+      <PARAM name="name" datatype="char" arraysize="2" value="#1"/>
+      <PARAM name="length" datatype="long" value="512"/>
+      <PARAM name="name" datatype="char" arraysize="2" value="#2"/>
+      <PARAM name="length" datatype="long" value="512"/>
+      <PARAM name="name" datatype="char" arraysize="2" value="#3"/>
+      <PARAM name="length" datatype="long" value="26"/>
+      <PARAM name="name" datatype="char" arraysize="2" value="#4"/>
+      <PARAM name="length" datatype="long" value="1"/>
+      <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <PARAM name="algorithm" datatype="char" arraysize="3" value="SIN">
+        <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
+      </PARAM>
+      <PARAM name="nativeRefValue" datatype="double" value="256.0">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="targetRefValue" datatype="double" value="190.925">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="scale" datatype="double" value="-0.001388888923">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="nativeRefValue" datatype="double" value="257.0">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="targetRefValue" datatype="double" value="31.0">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="scale" datatype="double" value="0.001388888923">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="algorithm" datatype="char" arraysize="3" value="HEL">
+        <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
+      </PARAM>
+      <PARAM name="nativeRefValue" datatype="double" value="12.0">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="targetRefValue" datatype="double" value="6750000.0">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="scale" datatype="double" value="-43104.6641">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="nativeValue" datatype="int" value="0"/>
+      <PARAM name="polstate" datatype="char" arraysize="1" value="I"/>
+      <PARAM name="nativeValue" datatype="int" value="1"/>
+      <PARAM name="polstate" datatype="char" arraysize="1" value="Q"/>
+      <PARAM name="nativeValue" datatype="int" value="2"/>
+      <PARAM name="polstate" datatype="char" arraysize="1" value="U"/>
+      <PARAM name="nativeValue" datatype="int" value="3"/>
+      <PARAM name="polstate" datatype="char" arraysize="1" value="V"/>
       <!-- Data FIELDs -->
-      <FIELD ID="_image-PRIMARY" name="PRIMARY" datatype="int"/>
+      <FIELD ID="_image-PRIMARY" name="PRIMARY" datatype="int" unit="JY/BEAM"/>
       <DATA>
         <FITS extnum="0">
           <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/NGC_4676:I:1.4GHz:hg1996.LMV.fits"/>

Modified: trunk/projects/dm/CubeDM-1.0/examples/NGC_4676:I:1.4GHz:hg1996.LMV_annotated_byref.vot
==============================================================================
--- trunk/projects/dm/CubeDM-1.0/examples/NGC_4676:I:1.4GHz:hg1996.LMV_annotated_byref.vot	Sat Apr 29 00:29:07 2017	(r3993)
+++ trunk/projects/dm/CubeDM-1.0/examples/NGC_4676:I:1.4GHz:hg1996.LMV_annotated_byref.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -6,10 +6,6 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
-      <NAME>coordsys</NAME>
-      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml</URL>
-    </MODEL>
-    <MODEL>
       <NAME>cube</NAME>
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml</URL>
     </MODEL>
@@ -22,31 +18,109 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
       <NAME>trans</NAME>
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/trans/STCTrans-2.0.vo-dml.xml</URL>
     </MODEL>
     <GLOBALS>
-      <INSTANCE ID="_IPykZjnKKegGJhyB2" dmtype="coords:domain.spatial.Position2D">
-        <ATTRIBUTE dmrole="coords:domain.spatial.Position2D.coord">
-          <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-              <CONSTANT ref="_IhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
+      <INSTANCE ID="_0107jmoNEmJOJD1U" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <CONSTANT ref="_010qwTMCmKTln8F7" dmtype="coords:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.equinox">
+          <INSTANCE dmtype="coords:domain.spatial.Epoch">
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.type">
+              <CONSTANT ref="_017017fNEHUi0m9r" dmtype="coords:domain.spatial.EpochType"/>
+            </ATTRIBUTE>
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.year">
+              <CONSTANT ref="_017017foOjpZJkO0" dmtype="ivoa:real"/>
             </ATTRIBUTE>
-            <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-              <IDREF>_03t8vnIHXhUc7Hgw2</IDREF>
-            </REFERENCE>
           </INSTANCE>
-          <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-              <CONSTANT ref="_IwTBlKFGp2MWVh1Q" dmtype="ivoa:RealQuantity"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Spherical">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_013t8vnIHXhUc7Hg" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <CONSTANT ref="_0151zMZZfPTW5Ix7" dmtype="ivoa:string"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+              <INSTANCE ID="_0166beYLJfS4wfge" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <CONSTANT ref="_016SmHJzqTzQDhUw" dmtype="ivoa:string"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE ID="_102cR46CtJav0dt7" dmtype="coords:domain.spectral.SpectralFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:CoordSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <CONSTANT ref="_11oMl1BhfomyxokU" dmtype="ivoa:string"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE ID="_20pjQotFqeWE98Pv" dmtype="coords:domain.polarization.PolarizationFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.polarization.PolarizationSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:DiscreteAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <CONSTANT ref="_22BKLGwjN7pxl91E" dmtype="ivoa:string"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE ID="_30ZTlZXa2GNc1pNZ" dmtype="coords:domain.generic.GenericFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.generic.GenericCoordSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_31rEx5xkm8kQY3t5" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <CONSTANT ref="_32UHmGx2Owqo8OJO" dmtype="ivoa:string"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE ID="_IPykZjnKKegGJhyB" dmtype="meas:Position2D">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+            <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <CONSTANT ref="_IhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_013t8vnIHXhUc7Hg</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <CONSTANT ref="_IwTBlKFGp2MWVh1Q" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_0166beYLJfS4wfge</IDREF>
+                </REFERENCE>
+              </INSTANCE>
             </ATTRIBUTE>
-            <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-              <IDREF>_066beYLJfS4wfge42</IDREF>
-            </REFERENCE>
           </INSTANCE>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE dmtype="cube:NDImageDataset">
+      <INSTANCE dmtype="ds:experiment.ObsDataset">
         <ATTRIBUTE dmrole="ds:dataset.Dataset.dataProductType">
           <CONSTANT ref="_47Yrfb1KUNZfOEK8" dmtype="ds:dataset.DataProductType"/>
         </ATTRIBUTE>
@@ -77,35 +151,32 @@
               <CONSTANT ref="_4ylm8ZmZQyFkdnQ5" dmtype="ivoa:string"/>
             </ATTRIBUTE>
             <REFERENCE dmrole="ds:experiment.BaseTarget.position">
-              <IDREF>_IPykZjnKKegGJhyB2</IDREF>
+              <IDREF>_IPykZjnKKegGJhyB</IDREF>
             </REFERENCE>
           </INSTANCE>
         </COMPOSITION> 
-        <REFERENCE dmrole="cube:NDImageDataset.image">
-          <IDREF>_A9OKA8Pw7UvuTGbF2</IDREF>
-        </REFERENCE>
       </INSTANCE>
-      <INSTANCE ID="_A9OKA8Pw7UvuTGbF2" dmtype="cube:NDImage">
+      <INSTANCE dmtype="cube:NDImage">
         <COMPOSITION dmrole="cube:PixelatedDataProduct.pixelCoordSys"> 
-          <INSTANCE dmtype="cube:PixelCoordSys">
-            <COMPOSITION dmrole="coordsys:PixelCoordSystem.pixelFrame"> 
-              <INSTANCE ID="_P2LbnHGby9C8xEXu2" dmtype="coordsys:domain.pixel.PixelFrame">
-                <COMPOSITION dmrole="coordsys:domain.pixel.PixelFrame.coordSpace"> 
-                  <INSTANCE dmtype="coordsys:domain.pixel.PixelSpace">
-                    <COMPOSITION dmrole="coordsys:domain.pixel.CoordSpace.axis"> 
-                      <INSTANCE dmtype="coordsys:domain.pixel.PixelAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.name">
+          <INSTANCE dmtype="coords:PixelCoordSystem">
+            <COMPOSITION dmrole="coords:PixelCoordSystem.pixelFrame"> 
+              <INSTANCE ID="_P2LbnHGby9C8xEXu" dmtype="coords:domain.pixel.PixelFrame">
+                <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+                  <INSTANCE dmtype="coords:domain.pixel.PixelSpace">
+                    <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+                      <INSTANCE dmtype="coords:domain.pixel.PixelAxis">
+                        <ATTRIBUTE dmrole="coords:Axis.name">
                           <CONSTANT ref="_P7e6Synzc9HOciGt" dmtype="ivoa:string"/>
                         </ATTRIBUTE>
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.length">
+                        <ATTRIBUTE dmrole="coords:domain.pixel.PixelAxis.numPix">
                           <CONSTANT ref="_P7jCOVfS6gxAvFOt" dmtype="ivoa:nonnegativeInteger"/>
                         </ATTRIBUTE>
                       </INSTANCE>
-                      <INSTANCE dmtype="coordsys:domain.pixel.PixelAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.name">
+                      <INSTANCE dmtype="coords:domain.pixel.PixelAxis">
+                        <ATTRIBUTE dmrole="coords:Axis.name">
                           <CONSTANT ref="_P92rlgkl4aThpdtz" dmtype="ivoa:string"/>
                         </ATTRIBUTE>
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.length">
+                        <ATTRIBUTE dmrole="coords:domain.pixel.PixelAxis.numPix">
                           <CONSTANT ref="_P94Um7P1YMwo80xh" dmtype="ivoa:nonnegativeInteger"/>
                         </ATTRIBUTE>
                       </INSTANCE>
@@ -113,15 +184,15 @@
                   </INSTANCE>
                 </COMPOSITION> 
               </INSTANCE>
-              <INSTANCE ID="_P47KgaFieYoqb2oX2" dmtype="coordsys:domain.pixel.PixelFrame">
-                <COMPOSITION dmrole="coordsys:domain.pixel.PixelFrame.coordSpace"> 
-                  <INSTANCE dmtype="coordsys:domain.pixel.PixelSpace">
-                    <COMPOSITION dmrole="coordsys:domain.pixel.CoordSpace.axis"> 
-                      <INSTANCE dmtype="coordsys:domain.pixel.PixelAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.name">
+              <INSTANCE ID="_P47KgaFieYoqb2oX" dmtype="coords:domain.pixel.PixelFrame">
+                <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+                  <INSTANCE dmtype="coords:domain.pixel.PixelSpace">
+                    <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+                      <INSTANCE dmtype="coords:domain.pixel.PixelAxis">
+                        <ATTRIBUTE dmrole="coords:Axis.name">
                           <CONSTANT ref="_P9Bf5tMPge23oaMk" dmtype="ivoa:string"/>
                         </ATTRIBUTE>
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.length">
+                        <ATTRIBUTE dmrole="coords:domain.pixel.PixelAxis.numPix">
                           <CONSTANT ref="_P9L6tJ54MmbBKcdu" dmtype="ivoa:nonnegativeInteger"/>
                         </ATTRIBUTE>
                       </INSTANCE>
@@ -129,15 +200,15 @@
                   </INSTANCE>
                 </COMPOSITION> 
               </INSTANCE>
-              <INSTANCE ID="_P6qMonntFCTsZzuN2" dmtype="coordsys:domain.pixel.PixelFrame">
-                <COMPOSITION dmrole="coordsys:domain.pixel.PixelFrame.coordSpace"> 
-                  <INSTANCE dmtype="coordsys:domain.pixel.PixelSpace">
-                    <COMPOSITION dmrole="coordsys:domain.pixel.CoordSpace.axis"> 
-                      <INSTANCE dmtype="coordsys:domain.pixel.PixelAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.name">
+              <INSTANCE ID="_P6qMonntFCTsZzuN" dmtype="coords:domain.pixel.PixelFrame">
+                <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+                  <INSTANCE dmtype="coords:domain.pixel.PixelSpace">
+                    <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+                      <INSTANCE dmtype="coords:domain.pixel.PixelAxis">
+                        <ATTRIBUTE dmrole="coords:Axis.name">
                           <CONSTANT ref="_PBXOO8xsb4ya1MT5" dmtype="ivoa:string"/>
                         </ATTRIBUTE>
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.length">
+                        <ATTRIBUTE dmrole="coords:domain.pixel.PixelAxis.numPix">
                           <CONSTANT ref="_PCUKeZamsr4rRhVw" dmtype="ivoa:nonnegativeInteger"/>
                         </ATTRIBUTE>
                       </INSTANCE>
@@ -149,92 +220,26 @@
           </INSTANCE>
         </COMPOSITION> 
         <COMPOSITION dmrole="cube:DataProduct.coordSys"> 
-          <INSTANCE dmtype="cube:CoordSys">
-            <COMPOSITION dmrole="coordsys:AstroCoordSystem.spaceFrame"> 
-              <INSTANCE ID="_007jmoNEmJOJD1UJ2" dmtype="coordsys:domain.spatial.SpaceFrame">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-                  <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-                    <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-                      <CONSTANT ref="_03n6ijJtxZrw7x2z" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-                    </ATTRIBUTE>
-                  </INSTANCE>
-                </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-                  <CONSTANT ref="_00qwTMCmKTln8FAu" dmtype="coordsys:domain.spatial.StdRefFrame"/>
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <CONSTANT ref="_093n6ijJtxZrw7x2" dmtype="coords:domain.spatial.StdRefPosition"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.equinox">
-                  <INSTANCE dmtype="coordsys:domain.spatial.Epoch">
-                    <ATTRIBUTE dmrole="coordsys:domain.spatial.Epoch.type">
-                      <CONSTANT ref="_07017fNEHUi0m9rW" dmtype="coordsys:domain.spatial.EpochType"/>
-                    </ATTRIBUTE>
-                    <ATTRIBUTE dmrole="coordsys:domain.spatial.Epoch.year">
-                      <CONSTANT ref="_07017foOjpZJkO0E" dmtype="ivoa:real"/>
-                    </ATTRIBUTE>
-                  </INSTANCE>
-                </ATTRIBUTE>
-                <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-                  <INSTANCE dmtype="coordsys:domain.spatial.Spherical">
-                    <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-                      <INSTANCE ID="_03t8vnIHXhUc7Hgw2" dmtype="coordsys:domain.spatial.CoordAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
-                          <CONSTANT ref="_051zMZZfPTW5Ix7P" dmtype="ivoa:string"/>
-                        </ATTRIBUTE>
-                      </INSTANCE>
-                      <INSTANCE ID="_066beYLJfS4wfge42" dmtype="coordsys:domain.spatial.CoordAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
-                          <CONSTANT ref="_06SmHJzqTzQDhUwQ" dmtype="ivoa:string"/>
-                        </ATTRIBUTE>
-                      </INSTANCE>
-                    </COMPOSITION> 
-                  </INSTANCE>
-                </COMPOSITION> 
-              </INSTANCE>
-            </COMPOSITION> 
-            <COMPOSITION dmrole="coordsys:AstroCoordSystem.spectralFrame"> 
-              <INSTANCE ID="_102cR46CtJav0dt72" dmtype="coordsys:domain.spectral.SpectralFrame">
-                <COMPOSITION dmrole="coordsys:domain.spectral.SpectralFrame.coordSpace"> 
-                  <INSTANCE dmtype="coordsys:domain.spectral.CoordSpace1D">
-                    <COMPOSITION dmrole="coordsys:domain.spectral.CoordSpace.axis"> 
-                      <INSTANCE dmtype="coordsys:domain.spectral.CoordAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.name">
-                          <CONSTANT ref="_11oMl1BhfomyxokU" dmtype="ivoa:string"/>
-                        </ATTRIBUTE>
-                      </INSTANCE>
-                    </COMPOSITION> 
-                  </INSTANCE>
-                </COMPOSITION> 
               </INSTANCE>
-            </COMPOSITION> 
-            <COMPOSITION dmrole="coordsys:AstroCoordSystem.polarizationFrame"> 
-              <INSTANCE ID="_20pjQotFqeWE98Pv2" dmtype="coordsys:domain.polarization.PolarizationFrame">
-                <COMPOSITION dmrole="coordsys:domain.polarization.PolarizationFrame.coordSpace"> 
-                  <INSTANCE dmtype="coordsys:domain.polarization.CoordSpace1D">
-                    <COMPOSITION dmrole="coordsys:domain.polarization.CoordSpace.axis"> 
-                      <INSTANCE dmtype="coordsys:domain.polarization.DiscreteAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.polarization.DiscreteAxis.name">
-                          <CONSTANT ref="_22BKLGwjN7pxl91E" dmtype="ivoa:string"/>
-                        </ATTRIBUTE>
-                      </INSTANCE>
-                    </COMPOSITION> 
-                  </INSTANCE>
-                </COMPOSITION> 
-              </INSTANCE>
-            </COMPOSITION> 
-            <COMPOSITION dmrole="coordsys:CoordSys.genericFrame"> 
-              <INSTANCE dmtype="coordsys:domain.generic.GenericFrame">
-                <COMPOSITION dmrole="coordsys:domain.generic.GenericFrame.coordSpace"> 
-                  <INSTANCE dmtype="coordsys:domain.generic.CoordSpace1D">
-                    <COMPOSITION dmrole="coordsys:domain.generic.CoordSpace.axis"> 
-                      <INSTANCE ID="_31rEx5xkm8kQY3t52" dmtype="coordsys:domain.generic.CoordAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.generic.CoordAxis.name">
-                          <CONSTANT ref="_32UHmGx2Owqo8OJO" dmtype="ivoa:string"/>
-                        </ATTRIBUTE>
-                      </INSTANCE>
-                    </COMPOSITION> 
-                  </INSTANCE>
-                </COMPOSITION> 
-              </INSTANCE>
-            </COMPOSITION> 
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_0107jmoNEmJOJD1U</IDREF>
+            </REFERENCE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spectralFrame">
+              <IDREF>_102cR46CtJav0dt7</IDREF>
+            </REFERENCE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.polarizationFrame">
+              <IDREF>_20pjQotFqeWE98Pv</IDREF>
+            </REFERENCE>
+            <REFERENCE dmrole="coords:CoordSys.genericFrame">
+              <IDREF>_30ZTlZXa2GNc1pNZ</IDREF>
+            </REFERENCE>
           </INSTANCE>
         </COMPOSITION> 
         <COMPOSITION dmrole="cube:DataProduct.mappings"> 
@@ -273,10 +278,10 @@
                   </INSTANCE>
                 </COMPOSITION> 
                 <REFERENCE dmrole="trans:FrameTransform.nativeFrame">
-                  <IDREF>_P2LbnHGby9C8xEXu2</IDREF>
+                  <IDREF>_P2LbnHGby9C8xEXu</IDREF>
                 </REFERENCE>
                 <REFERENCE dmrole="trans:FrameTransform.targetFrame">
-                  <IDREF>_007jmoNEmJOJD1UJ2</IDREF>
+                  <IDREF>_0107jmoNEmJOJD1U</IDREF>
                 </REFERENCE>
               </INSTANCE>
               <INSTANCE dmtype="trans:FrameTransform">
@@ -301,10 +306,10 @@
                   </INSTANCE>
                 </COMPOSITION> 
                 <REFERENCE dmrole="trans:FrameTransform.nativeFrame">
-                  <IDREF>_P47KgaFieYoqb2oX2</IDREF>
+                  <IDREF>_P47KgaFieYoqb2oX</IDREF>
                 </REFERENCE>
                 <REFERENCE dmrole="trans:FrameTransform.targetFrame">
-                  <IDREF>_102cR46CtJav0dt72</IDREF>
+                  <IDREF>_102cR46CtJav0dt7</IDREF>
                 </REFERENCE>
               </INSTANCE>
               <INSTANCE dmtype="trans:FrameTransform">
@@ -316,9 +321,9 @@
                           <CONSTANT ref="_HBQjjBztJkzDlW6a" dmtype="ivoa:integer"/>
                         </ATTRIBUTE>
                         <ATTRIBUTE dmrole="trans:TPolarizationEntry.targetValue">
-                          <INSTANCE dmtype="coordsys:domain.polarization.PolStokesCoord">
-                            <ATTRIBUTE dmrole="coordsys:domain.polarization.PolStokesCoord.loc">
-                              <CONSTANT ref="_HHGsVbg2MzhxzLSk" dmtype="coordsys:domain.polarization.PolStokes"/>
+                          <INSTANCE dmtype="coords:domain.polarization.PolStokes">
+                            <ATTRIBUTE dmrole="coords:domain.polarization.PolStokes.cval">
+                              <CONSTANT ref="_HHGsVbg2MzhxzLSk" dmtype="coords:domain.polarization.PolStokesEnum"/>
                             </ATTRIBUTE>
                           </INSTANCE>
                         </ATTRIBUTE>
@@ -328,9 +333,9 @@
                           <CONSTANT ref="_HE1yJX9sVRlYnDXj" dmtype="ivoa:integer"/>
                         </ATTRIBUTE>
                         <ATTRIBUTE dmrole="trans:TPolarizationEntry.targetValue">
-                          <INSTANCE dmtype="coordsys:domain.polarization.PolStokesCoord">
-                            <ATTRIBUTE dmrole="coordsys:domain.polarization.PolStokesCoord.loc">
-                              <CONSTANT ref="_HHjWs8tQu0z4AGPj" dmtype="coordsys:domain.polarization.PolStokes"/>
+                          <INSTANCE dmtype="coords:domain.polarization.PolStokes">
+                            <ATTRIBUTE dmrole="coords:domain.polarization.PolStokes.cval">
+                              <CONSTANT ref="_HHjWs8tQu0z4AGPj" dmtype="coords:domain.polarization.PolStokesEnum"/>
                             </ATTRIBUTE>
                           </INSTANCE>
                         </ATTRIBUTE>
@@ -340,9 +345,9 @@
                           <CONSTANT ref="_HFACmkwGzSMoYtKN" dmtype="ivoa:integer"/>
                         </ATTRIBUTE>
                         <ATTRIBUTE dmrole="trans:TPolarizationEntry.targetValue">
-                          <INSTANCE dmtype="coordsys:domain.polarization.PolStokesCoord">
-                            <ATTRIBUTE dmrole="coordsys:domain.polarization.PolStokesCoord.loc">
-                              <CONSTANT ref="_HIMtJVoZxiuceyRY" dmtype="coordsys:domain.polarization.PolStokes"/>
+                          <INSTANCE dmtype="coords:domain.polarization.PolStokes">
+                            <ATTRIBUTE dmrole="coords:domain.polarization.PolStokes.cval">
+                              <CONSTANT ref="_HIMtJVoZxiuceyRY" dmtype="coords:domain.polarization.PolStokesEnum"/>
                             </ATTRIBUTE>
                           </INSTANCE>
                         </ATTRIBUTE>
@@ -352,9 +357,9 @@
                           <CONSTANT ref="_HFqXZPa31ppE3hdE" dmtype="ivoa:integer"/>
                         </ATTRIBUTE>
                         <ATTRIBUTE dmrole="trans:TPolarizationEntry.targetValue">
-                          <INSTANCE dmtype="coordsys:domain.polarization.PolStokesCoord">
-                            <ATTRIBUTE dmrole="coordsys:domain.polarization.PolStokesCoord.loc">
-                              <CONSTANT ref="_HJ29lCYYZMEJwPpz" dmtype="coordsys:domain.polarization.PolStokes"/>
+                          <INSTANCE dmtype="coords:domain.polarization.PolStokes">
+                            <ATTRIBUTE dmrole="coords:domain.polarization.PolStokes.cval">
+                              <CONSTANT ref="_HJ29lCYYZMEJwPpz" dmtype="coords:domain.polarization.PolStokesEnum"/>
                             </ATTRIBUTE>
                           </INSTANCE>
                         </ATTRIBUTE>
@@ -363,10 +368,10 @@
                   </INSTANCE>
                 </COMPOSITION> 
                 <REFERENCE dmrole="trans:FrameTransform.nativeFrame">
-                  <IDREF>_P6qMonntFCTsZzuN2</IDREF>
+                  <IDREF>_P6qMonntFCTsZzuN</IDREF>
                 </REFERENCE>
                 <REFERENCE dmrole="trans:FrameTransform.targetFrame">
-                  <IDREF>_20pjQotFqeWE98Pv2</IDREF>
+                  <IDREF>_20pjQotFqeWE98Pv</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -378,268 +383,111 @@
       </INSTANCE>
     </GLOBALS>
     <TEMPLATES tableref="_table1">
+        <INSTANCE ID="_AK9CaKnrQwqiiyvn3" dmtype="cube:Voxel">
+          <COMPOSITION dmrole="cube:DataElement.axis"> 
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="True"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:GenericCoordMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.generic.GenericCoordValue">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                        <COLUMN ref="_image-PRIMARY" dmtype="ivoa:IntegerQuantity"/>
+                      </ATTRIBUTE>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_31rEx5xkm8kQY3t5</IDREF>
+                      </REFERENCE>
+                    </INSTANCE>
+                  </ATTRIBUTE>
+                </INSTANCE>
+              </COMPOSITION> 
+            </INSTANCE>
+          </COMPOSITION> 
+        </INSTANCE>
     </TEMPLATES>
   </VODML>
   <RESOURCE>
     <TABLE ID="_table1">
-      <GROUP ID="_IPykZjnKKegGJhyB" name="TargetPosition">
-        <GROUP name="coord">
-          <PARAM ID="_IhKAdKcKlhfiUsag" name="loc" datatype="double" value="190.925"/>
-          <GROUP ref="_03t8vnIHXhUc7Hgw" name="REF_EQPOS_RA-Axis"/>
-        </GROUP>
-        <GROUP name="coord">
-          <PARAM ID="_IwTBlKFGp2MWVh1Q" name="loc" datatype="double" value="31.0"/>
-          <GROUP ref="_066beYLJfS4wfge4" name="REF_EQPOS_DEC-Axis"/>
-        </GROUP>
-      </GROUP>
-      <GROUP name="NDImageDataset">
-        <DESCRIPTION>N-Dimensional Image Dataset</DESCRIPTION>
-        <PARAM ID="_47Yrfb1KUNZfOEK8" name="dataProductType" datatype="char" arraysize="5" ucd="meta.id" value="IMAGE">
-          <DESCRIPTION>Dataset type</DESCRIPTION>
-        </PARAM>
-        <PARAM ID="_4DcwmCqLzkpXADh4" name="dataProductSubtype" datatype="char" arraysize="18" ucd="meta.id" value="4D Pixelated Image">
-          <DESCRIPTION>Dataset subtype</DESCRIPTION>
-        </PARAM>
-        <PARAM ID="_4GQQpjxvwn9XD0e1" name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
-          <DESCRIPTION>Calibration level</DESCRIPTION>
-        </PARAM>
-        <GROUP name="DataID">
-          <DESCRIPTION>Dataset identification metadata</DESCRIPTION>
-        </GROUP>
-        <GROUP name="ObsConfig">
-          <DESCRIPTION>ObsConfig Object</DESCRIPTION>
-          <GROUP name="Instrument">
-            <DESCRIPTION>Metadata for the Instrument which created the data</DESCRIPTION>
-            <PARAM ID="_60HpJl6Eph8CdiKZ" name="name" datatype="char" arraysize="3" ucd="meta.id;instr" value="VLA">
-              <DESCRIPTION>Instrument ID</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="AstroTarget">
-          <DESCRIPTION>AstroTarget Object</DESCRIPTION>
-          <PARAM ID="_4ylm8ZmZQyFkdnQ5" name="name" datatype="char" arraysize="8" ucd="meta.id;src" value="NGC 4676">
-            <DESCRIPTION>Target name</DESCRIPTION>
-          </PARAM>
-          <GROUP ref="_IPykZjnKKegGJhyB" name="REF_TargetPosition">
-            <DESCRIPTION>Target location (eg: RA, DEC)</DESCRIPTION>
-          </GROUP>
-        </GROUP>
-        <GROUP ref="_A9OKA8Pw7UvuTGbF" name="REF_NDImage">
-          <DESCRIPTION>Image data</DESCRIPTION>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_A9OKA8Pw7UvuTGbF" name="NDImage">
-        <GROUP name="PixelCoordSys">
-          <DESCRIPTION>Pixel Coordinate System</DESCRIPTION>
-          <GROUP ID="_P2LbnHGby9C8xEXu" name="PixelFrame1">
-            <DESCRIPTION>2D Pixel Frame</DESCRIPTION>
-            <GROUP name="PixelSpace1">
-              <DESCRIPTION>2D Coordinate Space</DESCRIPTION>
-              <GROUP name="Pixel_Axis1">
-                <PARAM ID="_P7e6Synzc9HOciGt" name="name" datatype="char" arraysize="2" value="#1"/>
-                <PARAM ID="_P7jCOVfS6gxAvFOt" name="length" datatype="long" value="512"/>
-              </GROUP>
-              <GROUP name="Pixel_Axis2">
-                <PARAM ID="_P92rlgkl4aThpdtz" name="name" datatype="char" arraysize="2" value="#2"/>
-                <PARAM ID="_P94Um7P1YMwo80xh" name="length" datatype="long" value="512"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP ID="_P47KgaFieYoqb2oX" name="PixelFrame2">
-            <DESCRIPTION>1D Pixel Frame</DESCRIPTION>
-            <GROUP name="PixelSpace2">
-              <DESCRIPTION>1D Coordinate Space</DESCRIPTION>
-              <GROUP name="Pixel_Axis3">
-                <PARAM ID="_P9Bf5tMPge23oaMk" name="name" datatype="char" arraysize="2" value="#3"/>
-                <PARAM ID="_P9L6tJ54MmbBKcdu" name="length" datatype="long" value="26"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP ID="_P6qMonntFCTsZzuN" name="PixelFrame3">
-            <DESCRIPTION>1D Pixel Frame</DESCRIPTION>
-            <GROUP name="PixelSpace3">
-              <DESCRIPTION>1D Coordinate Space</DESCRIPTION>
-              <GROUP name="Pixel_Axis4">
-                <PARAM ID="_PBXOO8xsb4ya1MT5" name="name" datatype="char" arraysize="2" value="#4"/>
-                <PARAM ID="_PCUKeZamsr4rRhVw" name="length" datatype="long" value="1"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="CoordSys-Phys">
-          <DESCRIPTION>Physical Coordinate System</DESCRIPTION>
-          <GROUP ID="_007jmoNEmJOJD1UJ" name="EQPOSFrame">
-            <DESCRIPTION>Physical spatial domain frame</DESCRIPTION>
-            <GROUP name="origin">
-              <PARAM ID="_03n6ijJtxZrw7x2z" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-            </GROUP>
-            <PARAM ID="_00qwTMCmKTln8FAu" name="orientation" datatype="char" arraysize="4" value="ICRS"/>
-            <GROUP name="equinox">
-              <PARAM ID="_07017fNEHUi0m9rW" name="type" datatype="char" arraysize="1" value="B"/>
-              <PARAM ID="_07017foOjpZJkO0E" name="year" datatype="double" value="1950.0"/>
-            </GROUP>
-            <GROUP name="EQPOSFrame_CoordSpace">
-              <DESCRIPTION>Spherical coordinate space</DESCRIPTION>
-              <GROUP ID="_03t8vnIHXhUc7Hgw" name="EQPOS_RA-Axis">
-                <DESCRIPTION>ra axis</DESCRIPTION>
-                <PARAM ID="_051zMZZfPTW5Ix7P" name="name" datatype="char" arraysize="2" value="ra"/>
-              </GROUP>
-              <GROUP ID="_066beYLJfS4wfge4" name="EQPOS_DEC-Axis">
-                <DESCRIPTION>dec axis</DESCRIPTION>
-                <PARAM ID="_06SmHJzqTzQDhUwQ" name="name" datatype="char" arraysize="3" value="dec"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP ID="_102cR46CtJav0dt7" name="FELOFrame">
-            <DESCRIPTION>Physical spectral domain frame</DESCRIPTION>
-            <GROUP name="FELOFrame_CoordSpace">
-              <DESCRIPTION>1D coordinate space</DESCRIPTION>
-              <GROUP name="FELO-Axis">
-                <DESCRIPTION>felo axis</DESCRIPTION>
-                <PARAM ID="_11oMl1BhfomyxokU" name="name" datatype="char" arraysize="4" value="felo"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP ID="_20pjQotFqeWE98Pv" name="PolFrame">
-            <DESCRIPTION>Physical polarizaton domain frame</DESCRIPTION>
-            <GROUP name="PolFrame_CoordSpace">
-              <DESCRIPTION>1D coordinate space</DESCRIPTION>
-              <GROUP name="Pol-Axis">
-                <DESCRIPTION>pol axis</DESCRIPTION>
-                <PARAM ID="_22BKLGwjN7pxl91E" name="name" datatype="char" arraysize="6" value="stokes"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="GenericFrame">
-            <DESCRIPTION>Image data value frame</DESCRIPTION>
-            <GROUP name="GenericFrame_CoordSpace">
-              <DESCRIPTION>Image value coordinate space</DESCRIPTION>
-              <GROUP ID="_31rEx5xkm8kQY3t5" name="Image_CoordAxis">
-                <DESCRIPTION>Image value axis</DESCRIPTION>
-                <PARAM ID="_32UHmGx2Owqo8OJO" name="name" datatype="char" arraysize="9" value="intensity"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Mappings">
-          <DESCRIPTION>Frame Transforms</DESCRIPTION>
-          <GROUP name="PIX2EQPOS">
-            <DESCRIPTION>Pix-to-Sky Transform</DESCRIPTION>
-            <GROUP name="PIX2EQPOS_Projection">
-              <DESCRIPTION>WCS Projection instance</DESCRIPTION>
-              <PARAM ID="_FLBFsQNIF3YCICxR" name="algorithm" datatype="char" arraysize="3" value="SIN">
-                <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
-              </PARAM>
-              <GROUP name="PIX2EQPOS_AXIS1">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM ID="_FMOhAWvzKxqZXk4o" name="nativeRefValue" datatype="double" value="256.0">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_FMnxvMOY67DSgu5q" name="targetRefValue" datatype="double" value="190.925">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_FMrpC1i7rq57A5UK" name="scale" datatype="double" value="-0.001388888923">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-              <GROUP name="PIX2EQPOS_AXIS2">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM ID="_FNVXOcj6mqOImuAW" name="nativeRefValue" datatype="double" value="257.0">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_FOSj5q7itFyYXIhF" name="targetRefValue" datatype="double" value="31.0">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_FOTWLNQdDk2zt8On" name="scale" datatype="double" value="0.001388888923">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-            </GROUP>
-            <GROUP ref="_P2LbnHGby9C8xEXu" name="REF_PixelFrame1">
-              <DESCRIPTION>Originating Frame (pix)</DESCRIPTION>
-            </GROUP>
-            <GROUP ref="_007jmoNEmJOJD1UJ" name="REF_EQPOSFrame">
-              <DESCRIPTION>Resulting Frame (eqpos)</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="PIX2FELO">
-            <DESCRIPTION>Pix-to-Sky Transform</DESCRIPTION>
-            <GROUP name="PIX2FELO_Projection">
-              <DESCRIPTION>WCS Projection instance</DESCRIPTION>
-              <PARAM ID="_GMN1c2LQA9RtAIHM" name="algorithm" datatype="char" arraysize="3" value="HEL">
-                <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
-              </PARAM>
-              <GROUP name="PIX2FELO_AXIS">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM ID="_GUAckZWbeQCRdw0f" name="nativeRefValue" datatype="double" value="12.0">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_GUdJz0SSFjCK4xRw" name="targetRefValue" datatype="double" value="6750000.0">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_GV2k4PxcpXzcmgI5" name="scale" datatype="double" value="-43104.6641">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-            </GROUP>
-            <GROUP ref="_P47KgaFieYoqb2oX" name="REF_PixelFrame2">
-              <DESCRIPTION>Originating Frame (pix)</DESCRIPTION>
-            </GROUP>
-            <GROUP ref="_102cR46CtJav0dt7" name="REF_FELOFrame">
-              <DESCRIPTION>Resulting Frame (felo)</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="PIX2STOKES">
-            <DESCRIPTION>Pix-to-Pol Transform</DESCRIPTION>
-            <GROUP name="LOOKUPMAP">
-              <GROUP name="LOOKUPMAP_E1">
-                <PARAM ID="_HBQjjBztJkzDlW6a" name="nativeValue" datatype="int" value="0"/>
-                <GROUP name="targetValue">
-                  <PARAM ID="_HHGsVbg2MzhxzLSk" name="loc" datatype="char" arraysize="1" value="I"/>
-                </GROUP>
-              </GROUP>
-              <GROUP name="LOOKUPMAP_E2">
-                <PARAM ID="_HE1yJX9sVRlYnDXj" name="nativeValue" datatype="int" value="1"/>
-                <GROUP name="targetValue">
-                  <PARAM ID="_HHjWs8tQu0z4AGPj" name="loc" datatype="char" arraysize="1" value="Q"/>
-                </GROUP>
-              </GROUP>
-              <GROUP name="LOOKUPMAP_E3">
-                <PARAM ID="_HFACmkwGzSMoYtKN" name="nativeValue" datatype="int" value="2"/>
-                <GROUP name="targetValue">
-                  <PARAM ID="_HIMtJVoZxiuceyRY" name="loc" datatype="char" arraysize="1" value="U"/>
-                </GROUP>
-              </GROUP>
-              <GROUP name="LOOKUPMAP_E4">
-                <PARAM ID="_HFqXZPa31ppE3hdE" name="nativeValue" datatype="int" value="3"/>
-                <GROUP name="targetValue">
-                  <PARAM ID="_HJ29lCYYZMEJwPpz" name="loc" datatype="char" arraysize="1" value="V"/>
-                </GROUP>
-              </GROUP>
-            </GROUP>
-            <GROUP ref="_P6qMonntFCTsZzuN" name="REF_PixelFrame3">
-              <DESCRIPTION>Originating Frame (pix)</DESCRIPTION>
-            </GROUP>
-            <GROUP ref="_20pjQotFqeWE98Pv" name="REF_PolFrame">
-              <DESCRIPTION>Resulting Frame (polarization)</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Voxel">
-          <GROUP name="ImageDataAxis">
-            <DESCRIPTION>Image voxel dependent axis</DESCRIPTION>
-            <GROUP name="ImageData">
-              <DESCRIPTION>Image voxel value (observable)</DESCRIPTION>
-              <GROUP name="coord">
-                <FIELDref ref="_image-PRIMARY"/>
-                <GROUP ref="_31rEx5xkm8kQY3t5" name="REF_Image_CoordAxis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-      </GROUP>
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM ID="_010qwTMCmKTln8F7" name="orientation" datatype="char" arraysize="4" value="ICRS"/>
+      <PARAM ID="_017017fNEHUi0m9r" name="type" datatype="char" arraysize="1" value="B"/>
+      <PARAM ID="_017017foOjpZJkO0" name="year" datatype="double" value="1950.0"/>
+      <PARAM ID="_0151zMZZfPTW5Ix7" name="name" datatype="char" arraysize="2" value="ra"/>
+      <PARAM ID="_016SmHJzqTzQDhUw" name="name" datatype="char" arraysize="3" value="dec"/>
+      <PARAM ID="_11oMl1BhfomyxokU" name="name" datatype="char" arraysize="4" value="felo"/>
+      <PARAM ID="_22BKLGwjN7pxl91E" name="name" datatype="char" arraysize="6" value="stokes"/>
+      <PARAM ID="_32UHmGx2Owqo8OJO" name="name" datatype="char" arraysize="9" value="intensity"/>
+      <PARAM ID="_IhKAdKcKlhfiUsag" name="targ_ra" datatype="double" value="190.925"/>
+      <PARAM ID="_IwTBlKFGp2MWVh1Q" name="targ_dec" datatype="double" value="31.0"/>
+      <PARAM ID="_47Yrfb1KUNZfOEK8" name="dataProductType" datatype="char" arraysize="5" ucd="meta.id" value="IMAGE">
+        <DESCRIPTION>Dataset type</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_4DcwmCqLzkpXADh4" name="dataProductSubtype" datatype="char" arraysize="18" ucd="meta.id" value="4D Pixelated Image">
+        <DESCRIPTION>Dataset subtype</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_4GQQpjxvwn9XD0e1" name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
+        <DESCRIPTION>Calibration level</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_60HpJl6Eph8CdiKZ" name="name" datatype="char" arraysize="3" ucd="meta.id;instr" value="VLA">
+        <DESCRIPTION>Instrument ID</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_4ylm8ZmZQyFkdnQ5" name="name" datatype="char" arraysize="8" ucd="meta.id;src" value="NGC 4676">
+        <DESCRIPTION>Target name</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_P7e6Synzc9HOciGt" name="name" datatype="char" arraysize="2" value="#1"/>
+      <PARAM ID="_P7jCOVfS6gxAvFOt" name="length" datatype="long" value="512"/>
+      <PARAM ID="_P92rlgkl4aThpdtz" name="name" datatype="char" arraysize="2" value="#2"/>
+      <PARAM ID="_P94Um7P1YMwo80xh" name="length" datatype="long" value="512"/>
+      <PARAM ID="_P9Bf5tMPge23oaMk" name="name" datatype="char" arraysize="2" value="#3"/>
+      <PARAM ID="_P9L6tJ54MmbBKcdu" name="length" datatype="long" value="26"/>
+      <PARAM ID="_PBXOO8xsb4ya1MT5" name="name" datatype="char" arraysize="2" value="#4"/>
+      <PARAM ID="_PCUKeZamsr4rRhVw" name="length" datatype="long" value="1"/>
+      <PARAM ID="_093n6ijJtxZrw7x2" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <PARAM ID="_FLBFsQNIF3YCICxR" name="algorithm" datatype="char" arraysize="3" value="SIN">
+        <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_FMOhAWvzKxqZXk4o" name="nativeRefValue" datatype="double" value="256.0">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_FMnxvMOY67DSgu5q" name="targetRefValue" datatype="double" value="190.925">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_FMrpC1i7rq57A5UK" name="scale" datatype="double" value="-0.001388888923">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_FNVXOcj6mqOImuAW" name="nativeRefValue" datatype="double" value="257.0">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_FOSj5q7itFyYXIhF" name="targetRefValue" datatype="double" value="31.0">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_FOTWLNQdDk2zt8On" name="scale" datatype="double" value="0.001388888923">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_GMN1c2LQA9RtAIHM" name="algorithm" datatype="char" arraysize="3" value="HEL">
+        <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_GUAckZWbeQCRdw0f" name="nativeRefValue" datatype="double" value="12.0">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_GUdJz0SSFjCK4xRw" name="targetRefValue" datatype="double" value="6750000.0">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_GV2k4PxcpXzcmgI5" name="scale" datatype="double" value="-43104.6641">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_HBQjjBztJkzDlW6a" name="nativeValue" datatype="int" value="0"/>
+      <PARAM ID="_HHGsVbg2MzhxzLSk" name="polstate" datatype="char" arraysize="1" value="I"/>
+      <PARAM ID="_HE1yJX9sVRlYnDXj" name="nativeValue" datatype="int" value="1"/>
+      <PARAM ID="_HHjWs8tQu0z4AGPj" name="polstate" datatype="char" arraysize="1" value="Q"/>
+      <PARAM ID="_HFACmkwGzSMoYtKN" name="nativeValue" datatype="int" value="2"/>
+      <PARAM ID="_HIMtJVoZxiuceyRY" name="polstate" datatype="char" arraysize="1" value="U"/>
+      <PARAM ID="_HFqXZPa31ppE3hdE" name="nativeValue" datatype="int" value="3"/>
+      <PARAM ID="_HJ29lCYYZMEJwPpz" name="polstate" datatype="char" arraysize="1" value="V"/>
       <!-- Data FIELDs -->
-      <FIELD ID="_image-PRIMARY" name="PRIMARY" datatype="int"/>
+      <FIELD ID="_image-PRIMARY" name="PRIMARY" datatype="int" unit="JY/BEAM"/>
       <DATA>
         <FITS extnum="0">
           <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/NGC_4676:I:1.4GHz:hg1996.LMV.fits"/>

Modified: trunk/projects/dm/CubeDM-1.0/examples/chandra_2Dsky_image.vot
==============================================================================
--- trunk/projects/dm/CubeDM-1.0/examples/chandra_2Dsky_image.vot	Sat Apr 29 00:29:07 2017	(r3993)
+++ trunk/projects/dm/CubeDM-1.0/examples/chandra_2Dsky_image.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -29,9 +29,6 @@
       </GROUP>
       <GROUP ID="_010512XxjJ6d2Yfk" name="SkyFrame">
         <DESCRIPTION>SKY - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
         <GROUP name="SkyFrame_CoordSpace">
           <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
@@ -47,9 +44,6 @@
       </GROUP>
       <GROUP ID="_01016p6qFkb1I2p7" name="ICRSFrame">
         <DESCRIPTION>EQPOS - World spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <PARAM name="orientation" datatype="char" arraysize="4" value="ICRS"/>
         <GROUP name="equinox">
           <PARAM name="type" datatype="char" arraysize="1" value="J"/>
@@ -73,12 +67,14 @@
       </GROUP>
       <GROUP ID="_HPykZjnKKegGJhyB" name="TargetPosition">
         <GROUP name="coord">
-          <PARAM name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_RA-Axis"/>
-        </GROUP>
-        <GROUP name="coord">
-          <PARAM name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_DEC-Axis"/>
+          <GROUP name="ra">
+            <PARAM name="targ_ra" datatype="double" value="NaN"/>
+            <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_RA-Axis"/>
+          </GROUP>
+          <GROUP name="dec">
+            <PARAM name="targ_dec" datatype="double" value="NaN"/>
+            <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_DEC-Axis"/>
+          </GROUP>
         </GROUP>
       </GROUP>
       <GROUP name="NDImageDataset">
@@ -92,9 +88,6 @@
         <PARAM name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
           <DESCRIPTION>Calibration level</DESCRIPTION>
         </PARAM>
-        <GROUP name="Characterisation">
-          <DESCRIPTION>Characteristics of data coordinate space</DESCRIPTION>
-        </GROUP>
         <GROUP name="Curation">
           <DESCRIPTION>Dataset curation metadata</DESCRIPTION>
           <PARAM name="publisherDID" datatype="char" arraysize="20" ucd="meta.ref.url;meta.curation" value="ADS/Sa.CXO#obs/00460">
@@ -236,17 +229,8 @@
             <DESCRIPTION>Target location (eg: RA, DEC)</DESCRIPTION>
           </GROUP>
         </GROUP>
-        <GROUP ref="_6hrehomO3bIilaTo" name="REF_CoordSys-Phys">
-          <DESCRIPTION>Global coordinate systems (Physical)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A18RNKjFBdI7kMap" name="REF_CoordSys-World">
-          <DESCRIPTION>Global coordinate systems (World)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A9OKA8Pw7UvuTGbF" name="REF_NDImage">
-          <DESCRIPTION>Image data</DESCRIPTION>
-        </GROUP>
       </GROUP>
-      <GROUP ID="_A9OKA8Pw7UvuTGbF" name="NDImage">
+      <GROUP name="NDImage">
         <GROUP name="PixelCoordSys">
           <DESCRIPTION>Pixel Coordinate System</DESCRIPTION>
           <GROUP ID="_LPb9Mqr4SAtLO7E5" name="PixelFrame">
@@ -264,13 +248,19 @@
             </GROUP>
           </GROUP>
         </GROUP>
-        <GROUP ID="_6hrehomO3bIilaTo" name="CoordSys-Phys">
+        <GROUP name="CoordSys-Phys">
           <DESCRIPTION>Physical Coordinate System</DESCRIPTION>
+          <GROUP name="refPosition">
+            <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+          </GROUP>
           <GROUP ref="_0117pYWsEJmSbhJP" name="REF_GenericFrame"/>
           <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame"/>
         </GROUP>
-        <GROUP ID="_A18RNKjFBdI7kMap" name="CoordSys-World">
+        <GROUP name="CoordSys-World">
           <DESCRIPTION>World Coordinate System</DESCRIPTION>
+          <GROUP name="refPosition">
+            <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+          </GROUP>
           <GROUP ref="_0117pYWsEJmSbhJP" name="REF_GenericFrame"/>
           <GROUP ref="_01016p6qFkb1I2p7" name="REF_ICRSFrame"/>
         </GROUP>

Modified: trunk/projects/dm/CubeDM-1.0/examples/chandra_2Dsky_image_annotated.vot
==============================================================================
--- trunk/projects/dm/CubeDM-1.0/examples/chandra_2Dsky_image_annotated.vot	Sat Apr 29 00:29:07 2017	(r3993)
+++ trunk/projects/dm/CubeDM-1.0/examples/chandra_2Dsky_image_annotated.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -6,10 +6,6 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
-      <NAME>coordsys</NAME>
-      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml</URL>
-    </MODEL>
-    <MODEL>
       <NAME>cube</NAME>
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml</URL>
     </MODEL>
@@ -22,11 +18,15 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
       <NAME>trans</NAME>
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/trans/STCTrans-2.0.vo-dml.xml</URL>
     </MODEL>
     <GLOBALS>
-      <INSTANCE ID="_001J6U7FbgCwoWQF2" dmtype="ds:party.Organization">
+      <INSTANCE ID="_001J6U7FbgCwoWQF" dmtype="ds:party.Organization">
         <ATTRIBUTE dmrole="ds:party.Party.name">
           <LITERAL dmtype="ivoa:string" value="The Chandra X-Ray Center"/>
         </ATTRIBUTE>
@@ -43,7 +43,7 @@
           <LITERAL dmtype="ivoa:anyURI" value="http://chandra.si.edu/graphics/top/icon_cxc_foot.jpg"/>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE ID="_002J6U7FbgCwoWQF2" dmtype="ds:party.Individual">
+      <INSTANCE ID="_002J6U7FbgCwoWQF" dmtype="ds:party.Individual">
         <ATTRIBUTE dmrole="ds:party.Party.name">
           <LITERAL dmtype="ivoa:string" value="CXC HelpDesk System"/>
         </ATTRIBUTE>
@@ -57,12 +57,12 @@
           <LITERAL dmtype="ivoa:string" value="N/A"/>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE ID="_0117pYWsEJmSbhJP2" dmtype="coordsys:domain.temporal.TimeFrame">
-        <COMPOSITION dmrole="coordsys:domain.temporal.TimeFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.temporal.CoordSpace1D">
-            <COMPOSITION dmrole="coordsys:domain.temporal.CoordSpace.axis"> 
-              <INSTANCE ID="_0118WLLnSEBj0p462" dmtype="coordsys:domain.temporal.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.temporal.CoordAxis.name">
+      <INSTANCE ID="_0117pYWsEJmSbhJP" dmtype="coords:domain.generic.GenericFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.generic.GenericCoordSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0118WLLnSEBj0p46" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="counts"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -70,27 +70,20 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010512XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <LITERAL dmtype="coordsys:domain.spatial.StdRefFrame" value="CUSTOM"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE ID="_010512XxjJ6d2Yfk" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="CUSTOM"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="x"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="y"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -98,49 +91,42 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_01016p6qFkb1I2p72" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
+      <INSTANCE ID="_01016p6qFkb1I2p7" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="ICRS"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.equinox">
+          <INSTANCE dmtype="coords:domain.spatial.Epoch">
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.type">
+              <LITERAL dmtype="coords:domain.spatial.EpochType" value="J"/>
             </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <LITERAL dmtype="coordsys:domain.spatial.StdRefFrame" value="ICRS"/>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.equinox">
-          <INSTANCE dmtype="coordsys:domain.spatial.Epoch">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.Epoch.type">
-              <LITERAL dmtype="coordsys:domain.spatial.EpochType" value="J"/>
-            </ATTRIBUTE>
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.Epoch.year">
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.year">
               <LITERAL dmtype="ivoa:real" value="2000.0"/>
             </ATTRIBUTE>
           </INSTANCE>
         </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Spherical">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE ID="_01017W9piipgxj8L2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Spherical">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_01017W9piipgxj8L" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="ra"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="0.0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="360.0"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_01017cwvI7yS93aI2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_01017cwvI7yS93aI" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="dec"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="-90.0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="+90.0"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -148,27 +134,31 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_HPykZjnKKegGJhyB2" dmtype="coords:domain.spatial.Position2D">
-        <ATTRIBUTE dmrole="coords:domain.spatial.Position2D.coord">
-          <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-              <LITERAL dmtype="ivoa:RealQuantity" value="NaN"/>
-            </ATTRIBUTE>
-            <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-              <IDREF>_01017W9piipgxj8L2</IDREF>
-            </REFERENCE>
-          </INSTANCE>
-          <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-              <LITERAL dmtype="ivoa:RealQuantity" value="NaN"/>
+      <INSTANCE ID="_HPykZjnKKegGJhyB" dmtype="meas:Position2D">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+            <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="NaN"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_01017W9piipgxj8L</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="NaN"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_01017cwvI7yS93aI</IDREF>
+                </REFERENCE>
+              </INSTANCE>
             </ATTRIBUTE>
-            <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-              <IDREF>_01017cwvI7yS93aI2</IDREF>
-            </REFERENCE>
           </INSTANCE>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE dmtype="cube:NDImageDataset">
+      <INSTANCE dmtype="ds:experiment.ObsDataset">
         <ATTRIBUTE dmrole="ds:dataset.Dataset.dataProductType">
           <LITERAL dmtype="ds:dataset.DataProductType" value="IMAGE"/>
         </ATTRIBUTE>
@@ -178,10 +168,6 @@
         <ATTRIBUTE dmrole="ds:experiment.ObsDataset.calibLevel">
           <LITERAL dmtype="ivoa:integer" value="3"/>
         </ATTRIBUTE>
-        <COMPOSITION dmrole="ds:experiment.ObsDataset.characterisation"> 
-          <INSTANCE dmtype="ds:experiment.Characterisation">
-          </INSTANCE>
-        </COMPOSITION> 
         <COMPOSITION dmrole="ds:dataset.Dataset.curation"> 
           <INSTANCE dmtype="ds:dataset.Curation">
             <ATTRIBUTE dmrole="ds:dataset.Curation.publisherDID">
@@ -199,7 +185,7 @@
             <COMPOSITION dmrole="ds:dataset.Curation.contact"> 
               <INSTANCE dmtype="ds:dataset.Contact">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_002J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_002J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -209,7 +195,7 @@
                   <LITERAL dmtype="ivoa:anyURI" value="TBD"/>
                 </ATTRIBUTE>
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -255,14 +241,14 @@
                   <LITERAL dmtype="ivoa:string" value="CIAO: Chandra's data analysis system (ADS, PS); Fruscione et al. 2006, SPIE Proc. 6270, 62701V, D.R. Silvia and R.E. Doxsey, eds."/>
                 </ATTRIBUTE>
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
             <COMPOSITION dmrole="ds:dataset.DataID.creator"> 
               <INSTANCE dmtype="ds:dataset.Creator">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -293,7 +279,7 @@
             <COMPOSITION dmrole="ds:experiment.ObsConfig.facility"> 
               <INSTANCE dmtype="ds:experiment.Facility">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -334,39 +320,32 @@
               <LITERAL dmtype="ivoa:real" value="NaN"/>
             </ATTRIBUTE>
             <REFERENCE dmrole="ds:experiment.BaseTarget.position">
-              <IDREF>_HPykZjnKKegGJhyB2</IDREF>
+              <IDREF>_HPykZjnKKegGJhyB</IDREF>
             </REFERENCE>
           </INSTANCE>
         </COMPOSITION> 
-        <REFERENCE dmrole="ds:experiment.ObsDataset.coordSys">
-          <IDREF>_6hrehomO3bIilaTo2</IDREF>
-          <IDREF>_A18RNKjFBdI7kMap2</IDREF>
-        </REFERENCE>
-        <REFERENCE dmrole="cube:NDImageDataset.image">
-          <IDREF>_A9OKA8Pw7UvuTGbF2</IDREF>
-        </REFERENCE>
       </INSTANCE>
-      <INSTANCE ID="_A9OKA8Pw7UvuTGbF2" dmtype="cube:NDImage">
+      <INSTANCE dmtype="cube:NDImage">
         <COMPOSITION dmrole="cube:PixelatedDataProduct.pixelCoordSys"> 
-          <INSTANCE dmtype="cube:PixelCoordSys">
-            <COMPOSITION dmrole="coordsys:PixelCoordSystem.pixelFrame"> 
-              <INSTANCE ID="_LPb9Mqr4SAtLO7E52" dmtype="coordsys:domain.pixel.PixelFrame">
-                <COMPOSITION dmrole="coordsys:domain.pixel.PixelFrame.coordSpace"> 
-                  <INSTANCE dmtype="coordsys:domain.pixel.PixelSpace">
-                    <COMPOSITION dmrole="coordsys:domain.pixel.CoordSpace.axis"> 
-                      <INSTANCE dmtype="coordsys:domain.pixel.PixelAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.name">
+          <INSTANCE dmtype="coords:PixelCoordSystem">
+            <COMPOSITION dmrole="coords:PixelCoordSystem.pixelFrame"> 
+              <INSTANCE ID="_LPb9Mqr4SAtLO7E5" dmtype="coords:domain.pixel.PixelFrame">
+                <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+                  <INSTANCE dmtype="coords:domain.pixel.PixelSpace">
+                    <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+                      <INSTANCE dmtype="coords:domain.pixel.PixelAxis">
+                        <ATTRIBUTE dmrole="coords:Axis.name">
                           <LITERAL dmtype="ivoa:string" value="#1"/>
                         </ATTRIBUTE>
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.length">
+                        <ATTRIBUTE dmrole="coords:domain.pixel.PixelAxis.numPix">
                           <LITERAL dmtype="ivoa:nonnegativeInteger" value="50"/>
                         </ATTRIBUTE>
                       </INSTANCE>
-                      <INSTANCE dmtype="coordsys:domain.pixel.PixelAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.name">
+                      <INSTANCE dmtype="coords:domain.pixel.PixelAxis">
+                        <ATTRIBUTE dmrole="coords:Axis.name">
                           <LITERAL dmtype="ivoa:string" value="#2"/>
                         </ATTRIBUTE>
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.length">
+                        <ATTRIBUTE dmrole="coords:domain.pixel.PixelAxis.numPix">
                           <LITERAL dmtype="ivoa:nonnegativeInteger" value="100"/>
                         </ATTRIBUTE>
                       </INSTANCE>
@@ -378,20 +357,34 @@
           </INSTANCE>
         </COMPOSITION> 
         <COMPOSITION dmrole="cube:DataProduct.coordSys"> 
-          <INSTANCE ID="_6hrehomO3bIilaTo2" dmtype="cube:CoordSys">
-            <REFERENCE dmrole="coordsys:CoordSys.genericFrame">
-              <IDREF>_0117pYWsEJmSbhJP2</IDREF>
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <LITERAL dmtype="coords:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:CoordSys.genericFrame">
+              <IDREF>_0117pYWsEJmSbhJP</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spaceFrame">
-              <IDREF>_010512XxjJ6d2Yfk2</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_010512XxjJ6d2Yfk</IDREF>
             </REFERENCE>
           </INSTANCE>
-          <INSTANCE ID="_A18RNKjFBdI7kMap2" dmtype="cube:CoordSys">
-            <REFERENCE dmrole="coordsys:CoordSys.genericFrame">
-              <IDREF>_0117pYWsEJmSbhJP2</IDREF>
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <LITERAL dmtype="coords:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:CoordSys.genericFrame">
+              <IDREF>_0117pYWsEJmSbhJP</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spaceFrame">
-              <IDREF>_01016p6qFkb1I2p72</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_01016p6qFkb1I2p7</IDREF>
             </REFERENCE>
           </INSTANCE>
         </COMPOSITION> 
@@ -511,10 +504,10 @@
                   </INSTANCE>
                 </COMPOSITION> 
                 <REFERENCE dmrole="trans:FrameTransform.nativeFrame">
-                  <IDREF>_LPb9Mqr4SAtLO7E52</IDREF>
+                  <IDREF>_LPb9Mqr4SAtLO7E5</IDREF>
                 </REFERENCE>
                 <REFERENCE dmrole="trans:FrameTransform.targetFrame">
-                  <IDREF>_010512XxjJ6d2Yfk2</IDREF>
+                  <IDREF>_010512XxjJ6d2Yfk</IDREF>
                 </REFERENCE>
               </INSTANCE>
               <INSTANCE dmtype="trans:FrameTransform">
@@ -550,10 +543,10 @@
                   </INSTANCE>
                 </COMPOSITION> 
                 <REFERENCE dmrole="trans:FrameTransform.nativeFrame">
-                  <IDREF>_010512XxjJ6d2Yfk2</IDREF>
+                  <IDREF>_010512XxjJ6d2Yfk</IDREF>
                 </REFERENCE>
                 <REFERENCE dmrole="trans:FrameTransform.targetFrame">
-                  <IDREF>_01016p6qFkb1I2p72</IDREF>
+                  <IDREF>_01016p6qFkb1I2p7</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -565,409 +558,205 @@
       </INSTANCE>
     </GLOBALS>
     <TEMPLATES tableref="_table1">
+        <INSTANCE ID="_AK9CaKnrQwqiiyvn3" dmtype="cube:Voxel">
+          <COMPOSITION dmrole="cube:DataElement.axis"> 
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="True"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:GenericCoordMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.generic.GenericCoordValue">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                        <COLUMN ref="_image-EVENTS_IMAGE" dmtype="ivoa:IntegerQuantity"/>
+                      </ATTRIBUTE>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0118WLLnSEBj0p46</IDREF>
+                      </REFERENCE>
+                    </INSTANCE>
+                  </ATTRIBUTE>
+                </INSTANCE>
+              </COMPOSITION> 
+            </INSTANCE>
+          </COMPOSITION> 
+        </INSTANCE>
     </TEMPLATES>
   </VODML>
   <RESOURCE>
     <TABLE ID="_table1">
-      <GROUP ID="_001J6U7FbgCwoWQF" name="SAO">
-        <DESCRIPTION>Smithsonian Astrophysical Observatory</DESCRIPTION>
-        <PARAM name="name" datatype="char" arraysize="24" value="The Chandra X-Ray Center"/>
-        <PARAM name="address" datatype="char" arraysize="41" value="60 Garden Street, Cambridge, MA 02138 USA"/>
-        <PARAM name="email" datatype="char" arraysize="27" ucd="meta.ref.url;meta.email" value="cxcweb at head.cfa.harvard.edu"/>
-        <PARAM name="phone" datatype="char" arraysize="12" value="617-496-7941"/>
-        <PARAM name="logo" datatype="char" arraysize="52" ucd="meta.ref.url" value="http://chandra.si.edu/graphics/top/icon_cxc_foot.jpg"/>
-      </GROUP>
-      <GROUP ID="_002J6U7FbgCwoWQF" name="CXCHelpdesk">
-        <DESCRIPTION>Contact Individual</DESCRIPTION>
-        <PARAM name="name" datatype="char" arraysize="19" value="CXC HelpDesk System"/>
-        <PARAM name="address" datatype="char" arraysize="3" value="N/A"/>
-        <PARAM name="email" datatype="char" arraysize="28" ucd="meta.ref.url;meta.email" value="cxchelp at head.cfa.harvard.edu"/>
-        <PARAM name="phone" datatype="char" arraysize="3" value="N/A"/>
-      </GROUP>
-      <GROUP ID="_0117pYWsEJmSbhJP" name="GenericFrame">
-        <DESCRIPTION>Image data value frame</DESCRIPTION>
-        <GROUP name="GenericFrame_CoordSpace">
-          <DESCRIPTION>Image value coordinate space</DESCRIPTION>
-          <GROUP ID="_0118WLLnSEBj0p46" name="Image_CoordAxis">
-            <DESCRIPTION>Image value axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="6" value="counts"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010512XxjJ6d2Yfk" name="SkyFrame">
-        <DESCRIPTION>SKY - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="SkyFrame_CoordSpace">
-          <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
-          <GROUP name="Sky_X-Axis">
-            <DESCRIPTION>x axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="1" value="x"/>
-          </GROUP>
-          <GROUP name="Sky_Y-Axis">
-            <DESCRIPTION>y axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="1" value="y"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_01016p6qFkb1I2p7" name="ICRSFrame">
-        <DESCRIPTION>EQPOS - World spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM name="orientation" datatype="char" arraysize="4" value="ICRS"/>
-        <GROUP name="equinox">
-          <PARAM name="type" datatype="char" arraysize="1" value="J"/>
-          <PARAM name="year" datatype="double" value="2000.0"/>
-        </GROUP>
-        <GROUP name="ICRSFrame_CoordSpace">
-          <DESCRIPTION>Spherical coordinate space</DESCRIPTION>
-          <GROUP ID="_01017W9piipgxj8L" name="ICRS_RA-Axis">
-            <DESCRIPTION>ra axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="2" value="ra"/>
-            <PARAM name="domainMin" datatype="double" value="0.0" unit="deg"/>
-            <PARAM name="domainMax" datatype="double" value="360.0" unit="deg"/>
-          </GROUP>
-          <GROUP ID="_01017cwvI7yS93aI" name="ICRS_DEC-Axis">
-            <DESCRIPTION>dec axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="3" value="dec"/>
-            <PARAM name="domainMin" datatype="double" value="-90.0" unit="deg"/>
-            <PARAM name="domainMax" datatype="double" value="+90.0" unit="deg"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_HPykZjnKKegGJhyB" name="TargetPosition">
-        <GROUP name="coord">
-          <PARAM name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_RA-Axis"/>
-        </GROUP>
-        <GROUP name="coord">
-          <PARAM name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_DEC-Axis"/>
-        </GROUP>
-      </GROUP>
-      <GROUP name="NDImageDataset">
-        <DESCRIPTION>N-Dimensional Image Dataset</DESCRIPTION>
-        <PARAM name="dataProductType" datatype="char" arraysize="5" ucd="meta.id" value="IMAGE">
-          <DESCRIPTION>Dataset type</DESCRIPTION>
-        </PARAM>
-        <PARAM name="dataProductSubtype" datatype="char" arraysize="18" ucd="meta.id" value="2D Pixelated Image">
-          <DESCRIPTION>Dataset subtype</DESCRIPTION>
-        </PARAM>
-        <PARAM name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
-          <DESCRIPTION>Calibration level</DESCRIPTION>
-        </PARAM>
-        <GROUP name="Characterisation">
-          <DESCRIPTION>Characteristics of data coordinate space</DESCRIPTION>
-        </GROUP>
-        <GROUP name="Curation">
-          <DESCRIPTION>Dataset curation metadata</DESCRIPTION>
-          <PARAM name="publisherDID" datatype="char" arraysize="20" ucd="meta.ref.url;meta.curation" value="ADS/Sa.CXO#obs/00460">
-            <DESCRIPTION>Publisher specified dataset ID</DESCRIPTION>
-          </PARAM>
-          <PARAM name="version" datatype="char" arraysize="1" ucd="meta.version;meta.curation" value="5">
-            <DESCRIPTION>Publisher version of the dataset</DESCRIPTION>
-          </PARAM>
-          <PARAM name="releaseDate" datatype="char" arraysize="19" ucd="time.release" value="2014-09-16T21:33:56">
-            <DESCRIPTION>Date curated dataset last modified time.release</DESCRIPTION>
-          </PARAM>
-          <PARAM name="rights" datatype="char" arraysize="6" ucd="meta.code" value="PUBLIC">
-            <DESCRIPTION>Level of access granted</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Contact">
-            <DESCRIPTION>Contact entity for curation service</DESCRIPTION>
-            <GROUP ref="_002J6U7FbgCwoWQF" name="REF_CXCHelpdesk">
-              <DESCRIPTION>Entity associated with Contact role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Publisher">
-            <DESCRIPTION>Publisher</DESCRIPTION>
-            <PARAM name="publisherID" datatype="char" arraysize="3" ucd="meta.ref.url;meta.curation" value="TBD">
-              <DESCRIPTION>URI for VO Publisher</DESCRIPTION>
-            </PARAM>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Entity associated with Publisher role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Publication">
-            <DESCRIPTION>Reference to publication associated with the dataset</DESCRIPTION>
-            <PARAM name="refCode" datatype="char" arraysize="19" ucd="meta.bib.bibcode" value="YYYYJJJJJVVVVMPPPPA">
-              <DESCRIPTION>URL or Bibcode of the publication</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="DataID">
-          <DESCRIPTION>Dataset identification metadata</DESCRIPTION>
-          <PARAM name="title" datatype="char" arraysize="78" ucd="meta.title;meta.dataset" value="IN FLIGHT CALIBRATION OF THE HETGS EFFECTIVE AREA AND CROSS DISPERSION PROFILE">
-            <DESCRIPTION>Dataset Title</DESCRIPTION>
-          </PARAM>
-          <PARAM name="datasetID" datatype="char" arraysize="20" ucd="meta.id;meta.dataset" value="ADS/Sa.CXO#obs/00460">
-            <DESCRIPTION>IVOA Dataset Identifier</DESCRIPTION>
-          </PARAM>
-          <PARAM name="creatorDID" datatype="char" arraysize="20" ucd="meta.id" value="ADS/Sa.CXO#obs/00460">
-            <DESCRIPTION>Creator defined Dataset Identifier</DESCRIPTION>
-          </PARAM>
-          <PARAM name="version" datatype="char" arraysize="1" ucd="meta.version;meta.dataset" value="5">
-            <DESCRIPTION>Dataset version assigned by creator</DESCRIPTION>
-          </PARAM>
-          <PARAM name="date" datatype="char" arraysize="19" ucd="time.epoch;meta.dataset" value="2014-09-16T21:33:56">
-            <DESCRIPTION>Data processing/creation date</DESCRIPTION>
-          </PARAM>
-          <PARAM name="creationType" datatype="char" arraysize="8" value="ARCHIVAL">
-            <DESCRIPTION>Dataset creation type</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Collection">
-            <DESCRIPTION>Collection to which the dataset is a member</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="7" value="Chandra">
-              <DESCRIPTION>Collection name</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-          <GROUP name="Contributor">
-            <DESCRIPTION>Contributor</DESCRIPTION>
-            <PARAM name="acknowledgment" datatype="char" arraysize="129" value="CIAO: Chandra's data analysis system (ADS, PS); Fruscione et al. 2006, SPIE Proc. 6270, 62701V, D.R. Silvia and R.E. Doxsey, eds.">
-              <DESCRIPTION>Acknowledgment expression for the contributor</DESCRIPTION>
-            </PARAM>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Individual associated with Contributor role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Creator">
-            <DESCRIPTION>Institution or entity which created the dataset</DESCRIPTION>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Individual associated with the Creator role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Derived">
-          <DESCRIPTION>Derived metadata</DESCRIPTION>
-          <GROUP name="ONTIME">
-            <DESCRIPTION>property derived from analysis of data content</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="8" value="EXPOSURE">
-              <DESCRIPTION>Total exposure time, with all known corrections</DESCRIPTION>
-            </PARAM>
-            <PARAM name="value" datatype="double" value="39930.0463526">
-              <DESCRIPTION>value of derived property</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="ObsConfig">
-          <DESCRIPTION>ObsConfig Object</DESCRIPTION>
-          <PARAM name="bandpass" datatype="char" arraysize="4" ucd="instr.bandpass" value="XRAY">
-            <DESCRIPTION>General regime in spectral domain</DESCRIPTION>
-          </PARAM>
-          <PARAM name="datasource" datatype="char" arraysize="7" value="POINTED">
-            <DESCRIPTION>Original source/type of data</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Facility">
-            <DESCRIPTION>Metadata for the facility performing the observation</DESCRIPTION>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Organization responsible for performing the observation</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Instrument">
-            <DESCRIPTION>Metadata for the Instrument which created the data</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="7" ucd="meta.id;instr" value="CHANDRA">
-              <DESCRIPTION>Instrument ID</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Proposal">
-          <DESCRIPTION>Proposal Object</DESCRIPTION>
-          <PARAM name="identifier" datatype="char" arraysize="8" ucd="meta.id;obs.proposal" value="12345678">
-            <DESCRIPTION>Proposal ID</DESCRIPTION>
-          </PARAM>
-        </GROUP>
-        <GROUP name="AstroTarget">
-          <DESCRIPTION>AstroTarget Object</DESCRIPTION>
-          <PARAM name="name" datatype="char" arraysize="6" ucd="meta.id;src" value="3C 273">
-            <DESCRIPTION>Target name</DESCRIPTION>
-          </PARAM>
-          <PARAM name="description" datatype="char" arraysize="3" ucd="meta.note;src" value="TBD">
-            <DESCRIPTION>Target descriptive text</DESCRIPTION>
-          </PARAM>
-          <PARAM name="objectClass" datatype="char" arraysize="3" ucd="src.class" value="TBD">
-            <DESCRIPTION>Target or object class</DESCRIPTION>
-          </PARAM>
-          <PARAM name="spectralClass" datatype="char" arraysize="3" ucd="src.spType" value="TBD">
-            <DESCRIPTION>Object spectral class</DESCRIPTION>
-          </PARAM>
-          <PARAM name="redshift" datatype="double" ucd="src.redshift" value="NaN">
-            <DESCRIPTION>Target redshift</DESCRIPTION>
-          </PARAM>
-          <PARAM name="varAmpl" datatype="double" value="NaN">
-            <DESCRIPTION>Target variability amplitude - typical</DESCRIPTION>
-          </PARAM>
-          <GROUP ref="_HPykZjnKKegGJhyB" name="REF_TargetPosition">
-            <DESCRIPTION>Target location (eg: RA, DEC)</DESCRIPTION>
-          </GROUP>
-        </GROUP>
-        <GROUP ref="_6hrehomO3bIilaTo" name="REF_CoordSys-Phys">
-          <DESCRIPTION>Global coordinate systems (Physical)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A18RNKjFBdI7kMap" name="REF_CoordSys-World">
-          <DESCRIPTION>Global coordinate systems (World)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A9OKA8Pw7UvuTGbF" name="REF_NDImage">
-          <DESCRIPTION>Image data</DESCRIPTION>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_A9OKA8Pw7UvuTGbF" name="NDImage">
-        <GROUP name="PixelCoordSys">
-          <DESCRIPTION>Pixel Coordinate System</DESCRIPTION>
-          <GROUP ID="_LPb9Mqr4SAtLO7E5" name="PixelFrame">
-            <DESCRIPTION>2D Pixel Frame</DESCRIPTION>
-            <GROUP name="PixelSpace">
-              <DESCRIPTION>Pixel Coordinate Space</DESCRIPTION>
-              <GROUP name="Pixel_Axis1">
-                <PARAM name="name" datatype="char" arraysize="2" value="#1"/>
-                <PARAM name="length" datatype="long" value="50"/>
-              </GROUP>
-              <GROUP name="Pixel_Axis2">
-                <PARAM name="name" datatype="char" arraysize="2" value="#2"/>
-                <PARAM name="length" datatype="long" value="100"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP ID="_6hrehomO3bIilaTo" name="CoordSys-Phys">
-          <DESCRIPTION>Physical Coordinate System</DESCRIPTION>
-          <GROUP ref="_0117pYWsEJmSbhJP" name="REF_GenericFrame"/>
-          <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame"/>
-        </GROUP>
-        <GROUP ID="_A18RNKjFBdI7kMap" name="CoordSys-World">
-          <DESCRIPTION>World Coordinate System</DESCRIPTION>
-          <GROUP ref="_0117pYWsEJmSbhJP" name="REF_GenericFrame"/>
-          <GROUP ref="_01016p6qFkb1I2p7" name="REF_ICRSFrame"/>
-        </GROUP>
-        <GROUP name="Mappings">
-          <DESCRIPTION>Frame Transforms</DESCRIPTION>
-          <GROUP name="PIX2SKY">
-            <DESCRIPTION>Pix-to-Sky Transform</DESCRIPTION>
-            <GROUP name="PIX2SKY_TMatrix">
-              <DESCRIPTION>Matrix Transform</DESCRIPTION>
-              <PARAM name="M" datatype="long" value="3">
-                <DESCRIPTION>MxN Matrix size - M</DESCRIPTION>
-              </PARAM>
-              <PARAM name="N" datatype="long" value="3">
-                <DESCRIPTION>MxN Matrix size - N</DESCRIPTION>
-              </PARAM>
-              <GROUP name="PIX2SKY_TMatrixElement00">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM name="m" datatype="long" value="0"/>
-                <PARAM name="n" datatype="long" value="0"/>
-                <PARAM name="value" datatype="double" value="100.0"/>
-              </GROUP>
-              <GROUP name="PIX2SKY_TMatrixElement01">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM name="m" datatype="long" value="0"/>
-                <PARAM name="n" datatype="long" value="1"/>
-                <PARAM name="value" datatype="double" value="0.0"/>
-              </GROUP>
-              <GROUP name="PIX2SKY_TMatrixElement02">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM name="m" datatype="long" value="0"/>
-                <PARAM name="n" datatype="long" value="2"/>
-                <PARAM name="value" datatype="double" value="0.0"/>
-              </GROUP>
-              <GROUP name="PIX2SKY_TMatrixElement10">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM name="m" datatype="long" value="1"/>
-                <PARAM name="n" datatype="long" value="0"/>
-                <PARAM name="value" datatype="double" value="-0.0"/>
-              </GROUP>
-              <GROUP name="PIX2SKY_TMatrixElement11">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM name="m" datatype="long" value="1"/>
-                <PARAM name="n" datatype="long" value="1"/>
-                <PARAM name="value" datatype="double" value="100.0"/>
-              </GROUP>
-              <GROUP name="PIX2SKY_TMatrixElement12">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM name="m" datatype="long" value="1"/>
-                <PARAM name="n" datatype="long" value="2"/>
-                <PARAM name="value" datatype="double" value="0.0"/>
-              </GROUP>
-              <GROUP name="PIX2SKY_TMatrixElement20">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM name="m" datatype="long" value="2"/>
-                <PARAM name="n" datatype="long" value="0"/>
-                <PARAM name="value" datatype="double" value="29950.0"/>
-              </GROUP>
-              <GROUP name="PIX2SKY_TMatrixElement21">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM name="m" datatype="long" value="2"/>
-                <PARAM name="n" datatype="long" value="1"/>
-                <PARAM name="value" datatype="double" value="29950.0"/>
-              </GROUP>
-              <GROUP name="PIX2SKY_TMatrixElement22">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM name="m" datatype="long" value="2"/>
-                <PARAM name="n" datatype="long" value="2"/>
-                <PARAM name="value" datatype="double" value="1.0"/>
-              </GROUP>
-            </GROUP>
-            <GROUP ref="_LPb9Mqr4SAtLO7E5" name="REF_PixelFrame">
-              <DESCRIPTION>Originating Frame (pixel)</DESCRIPTION>
-            </GROUP>
-            <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame">
-              <DESCRIPTION>Resulting Frame (sky)</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="SKY2EQPOS">
-            <DESCRIPTION>Sky-to-EQPOS Transform</DESCRIPTION>
-            <GROUP name="SKY2EQPOS_Projection">
-              <DESCRIPTION>WCS Projection instance</DESCRIPTION>
-              <PARAM name="algorithm" datatype="char" arraysize="3" value="TAN">
-                <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
-              </PARAM>
-              <GROUP name="SKY2EQPOS_AXIS1">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM name="nativeRefValue" datatype="double" value="32768.5">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="targetRefValue" datatype="double" value="187.280152947">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="scale" datatype="double" value="-3.66111111111e-05">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-              <GROUP name="SKY2EQPOS_AXIS2">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM name="nativeRefValue" datatype="double" value="32768.5">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="targetRefValue" datatype="double" value="2.05700100372">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="scale" datatype="double" value="3.66111111111e-05">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-            </GROUP>
-            <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame">
-              <DESCRIPTION>Originating Frame (sky)</DESCRIPTION>
-            </GROUP>
-            <GROUP ref="_01016p6qFkb1I2p7" name="REF_ICRSFrame">
-              <DESCRIPTION>Resulting Frame (eqpos)</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Voxel">
-          <GROUP name="ImageDataAxis">
-            <DESCRIPTION>Image voxel dependent axis</DESCRIPTION>
-            <GROUP name="ImageData">
-              <DESCRIPTION>Image voxel value (observable)</DESCRIPTION>
-              <GROUP name="coord">
-                <FIELDref ref="_image-EVENTS_IMAGE"/>
-                <GROUP ref="_0118WLLnSEBj0p46" name="REF_Image_CoordAxis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-      </GROUP>
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM name="name" datatype="char" arraysize="24" value="The Chandra X-Ray Center"/>
+      <PARAM name="address" datatype="char" arraysize="41" value="60 Garden Street, Cambridge, MA 02138 USA"/>
+      <PARAM name="email" datatype="char" arraysize="27" ucd="meta.ref.url;meta.email" value="cxcweb at head.cfa.harvard.edu"/>
+      <PARAM name="phone" datatype="char" arraysize="12" value="617-496-7941"/>
+      <PARAM name="logo" datatype="char" arraysize="52" ucd="meta.ref.url" value="http://chandra.si.edu/graphics/top/icon_cxc_foot.jpg"/>
+      <PARAM name="name" datatype="char" arraysize="19" value="CXC HelpDesk System"/>
+      <PARAM name="address" datatype="char" arraysize="3" value="N/A"/>
+      <PARAM name="email" datatype="char" arraysize="28" ucd="meta.ref.url;meta.email" value="cxchelp at head.cfa.harvard.edu"/>
+      <PARAM name="phone" datatype="char" arraysize="3" value="N/A"/>
+      <PARAM name="name" datatype="char" arraysize="6" value="counts"/>
+      <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM name="name" datatype="char" arraysize="1" value="x"/>
+      <PARAM name="name" datatype="char" arraysize="1" value="y"/>
+      <PARAM name="orientation" datatype="char" arraysize="4" value="ICRS"/>
+      <PARAM name="type" datatype="char" arraysize="1" value="J"/>
+      <PARAM name="year" datatype="double" value="2000.0"/>
+      <PARAM name="name" datatype="char" arraysize="2" value="ra"/>
+      <PARAM name="domainMin" datatype="double" value="0.0" unit="deg"/>
+      <PARAM name="domainMax" datatype="double" value="360.0" unit="deg"/>
+      <PARAM name="name" datatype="char" arraysize="3" value="dec"/>
+      <PARAM name="domainMin" datatype="double" value="-90.0" unit="deg"/>
+      <PARAM name="domainMax" datatype="double" value="+90.0" unit="deg"/>
+      <PARAM name="targ_ra" datatype="double" value="NaN"/>
+      <PARAM name="targ_dec" datatype="double" value="NaN"/>
+      <PARAM name="dataProductType" datatype="char" arraysize="5" ucd="meta.id" value="IMAGE">
+        <DESCRIPTION>Dataset type</DESCRIPTION>
+      </PARAM>
+      <PARAM name="dataProductSubtype" datatype="char" arraysize="18" ucd="meta.id" value="2D Pixelated Image">
+        <DESCRIPTION>Dataset subtype</DESCRIPTION>
+      </PARAM>
+      <PARAM name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
+        <DESCRIPTION>Calibration level</DESCRIPTION>
+      </PARAM>
+      <PARAM name="publisherDID" datatype="char" arraysize="20" ucd="meta.ref.url;meta.curation" value="ADS/Sa.CXO#obs/00460">
+        <DESCRIPTION>Publisher specified dataset ID</DESCRIPTION>
+      </PARAM>
+      <PARAM name="version" datatype="char" arraysize="1" ucd="meta.version;meta.curation" value="5">
+        <DESCRIPTION>Publisher version of the dataset</DESCRIPTION>
+      </PARAM>
+      <PARAM name="releaseDate" datatype="char" arraysize="19" ucd="time.release" value="2014-09-16T21:33:56">
+        <DESCRIPTION>Date curated dataset last modified time.release</DESCRIPTION>
+      </PARAM>
+      <PARAM name="rights" datatype="char" arraysize="6" ucd="meta.code" value="PUBLIC">
+        <DESCRIPTION>Level of access granted</DESCRIPTION>
+      </PARAM>
+      <PARAM name="publisherID" datatype="char" arraysize="3" ucd="meta.ref.url;meta.curation" value="TBD">
+        <DESCRIPTION>URI for VO Publisher</DESCRIPTION>
+      </PARAM>
+      <PARAM name="refCode" datatype="char" arraysize="19" ucd="meta.bib.bibcode" value="YYYYJJJJJVVVVMPPPPA">
+        <DESCRIPTION>URL or Bibcode of the publication</DESCRIPTION>
+      </PARAM>
+      <PARAM name="title" datatype="char" arraysize="78" ucd="meta.title;meta.dataset" value="IN FLIGHT CALIBRATION OF THE HETGS EFFECTIVE AREA AND CROSS DISPERSION PROFILE">
+        <DESCRIPTION>Dataset Title</DESCRIPTION>
+      </PARAM>
+      <PARAM name="datasetID" datatype="char" arraysize="20" ucd="meta.id;meta.dataset" value="ADS/Sa.CXO#obs/00460">
+        <DESCRIPTION>IVOA Dataset Identifier</DESCRIPTION>
+      </PARAM>
+      <PARAM name="creatorDID" datatype="char" arraysize="20" ucd="meta.id" value="ADS/Sa.CXO#obs/00460">
+        <DESCRIPTION>Creator defined Dataset Identifier</DESCRIPTION>
+      </PARAM>
+      <PARAM name="version" datatype="char" arraysize="1" ucd="meta.version;meta.dataset" value="5">
+        <DESCRIPTION>Dataset version assigned by creator</DESCRIPTION>
+      </PARAM>
+      <PARAM name="date" datatype="char" arraysize="19" ucd="time.epoch;meta.dataset" value="2014-09-16T21:33:56">
+        <DESCRIPTION>Data processing/creation date</DESCRIPTION>
+      </PARAM>
+      <PARAM name="creationType" datatype="char" arraysize="8" value="ARCHIVAL">
+        <DESCRIPTION>Dataset creation type</DESCRIPTION>
+      </PARAM>
+      <PARAM name="name" datatype="char" arraysize="7" value="Chandra">
+        <DESCRIPTION>Collection name</DESCRIPTION>
+      </PARAM>
+      <PARAM name="acknowledgment" datatype="char" arraysize="129" value="CIAO: Chandra's data analysis system (ADS, PS); Fruscione et al. 2006, SPIE Proc. 6270, 62701V, D.R. Silvia and R.E. Doxsey, eds.">
+        <DESCRIPTION>Acknowledgment expression for the contributor</DESCRIPTION>
+      </PARAM>
+      <PARAM name="name" datatype="char" arraysize="8" value="EXPOSURE">
+        <DESCRIPTION>Total exposure time, with all known corrections</DESCRIPTION>
+      </PARAM>
+      <PARAM name="value" datatype="double" value="39930.0463526">
+        <DESCRIPTION>value of derived property</DESCRIPTION>
+      </PARAM>
+      <PARAM name="bandpass" datatype="char" arraysize="4" ucd="instr.bandpass" value="XRAY">
+        <DESCRIPTION>General regime in spectral domain</DESCRIPTION>
+      </PARAM>
+      <PARAM name="datasource" datatype="char" arraysize="7" value="POINTED">
+        <DESCRIPTION>Original source/type of data</DESCRIPTION>
+      </PARAM>
+      <PARAM name="name" datatype="char" arraysize="7" ucd="meta.id;instr" value="CHANDRA">
+        <DESCRIPTION>Instrument ID</DESCRIPTION>
+      </PARAM>
+      <PARAM name="identifier" datatype="char" arraysize="8" ucd="meta.id;obs.proposal" value="12345678">
+        <DESCRIPTION>Proposal ID</DESCRIPTION>
+      </PARAM>
+      <PARAM name="name" datatype="char" arraysize="6" ucd="meta.id;src" value="3C 273">
+        <DESCRIPTION>Target name</DESCRIPTION>
+      </PARAM>
+      <PARAM name="description" datatype="char" arraysize="3" ucd="meta.note;src" value="TBD">
+        <DESCRIPTION>Target descriptive text</DESCRIPTION>
+      </PARAM>
+      <PARAM name="objectClass" datatype="char" arraysize="3" ucd="src.class" value="TBD">
+        <DESCRIPTION>Target or object class</DESCRIPTION>
+      </PARAM>
+      <PARAM name="spectralClass" datatype="char" arraysize="3" ucd="src.spType" value="TBD">
+        <DESCRIPTION>Object spectral class</DESCRIPTION>
+      </PARAM>
+      <PARAM name="redshift" datatype="double" ucd="src.redshift" value="NaN">
+        <DESCRIPTION>Target redshift</DESCRIPTION>
+      </PARAM>
+      <PARAM name="varAmpl" datatype="double" value="NaN">
+        <DESCRIPTION>Target variability amplitude - typical</DESCRIPTION>
+      </PARAM>
+      <PARAM name="name" datatype="char" arraysize="2" value="#1"/>
+      <PARAM name="length" datatype="long" value="50"/>
+      <PARAM name="name" datatype="char" arraysize="2" value="#2"/>
+      <PARAM name="length" datatype="long" value="100"/>
+      <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <PARAM name="M" datatype="long" value="3">
+        <DESCRIPTION>MxN Matrix size - M</DESCRIPTION>
+      </PARAM>
+      <PARAM name="N" datatype="long" value="3">
+        <DESCRIPTION>MxN Matrix size - N</DESCRIPTION>
+      </PARAM>
+      <PARAM name="m" datatype="long" value="0"/>
+      <PARAM name="n" datatype="long" value="0"/>
+      <PARAM name="value" datatype="double" value="100.0"/>
+      <PARAM name="m" datatype="long" value="0"/>
+      <PARAM name="n" datatype="long" value="1"/>
+      <PARAM name="value" datatype="double" value="0.0"/>
+      <PARAM name="m" datatype="long" value="0"/>
+      <PARAM name="n" datatype="long" value="2"/>
+      <PARAM name="value" datatype="double" value="0.0"/>
+      <PARAM name="m" datatype="long" value="1"/>
+      <PARAM name="n" datatype="long" value="0"/>
+      <PARAM name="value" datatype="double" value="-0.0"/>
+      <PARAM name="m" datatype="long" value="1"/>
+      <PARAM name="n" datatype="long" value="1"/>
+      <PARAM name="value" datatype="double" value="100.0"/>
+      <PARAM name="m" datatype="long" value="1"/>
+      <PARAM name="n" datatype="long" value="2"/>
+      <PARAM name="value" datatype="double" value="0.0"/>
+      <PARAM name="m" datatype="long" value="2"/>
+      <PARAM name="n" datatype="long" value="0"/>
+      <PARAM name="value" datatype="double" value="29950.0"/>
+      <PARAM name="m" datatype="long" value="2"/>
+      <PARAM name="n" datatype="long" value="1"/>
+      <PARAM name="value" datatype="double" value="29950.0"/>
+      <PARAM name="m" datatype="long" value="2"/>
+      <PARAM name="n" datatype="long" value="2"/>
+      <PARAM name="value" datatype="double" value="1.0"/>
+      <PARAM name="algorithm" datatype="char" arraysize="3" value="TAN">
+        <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
+      </PARAM>
+      <PARAM name="nativeRefValue" datatype="double" value="32768.5">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="targetRefValue" datatype="double" value="187.280152947">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="scale" datatype="double" value="-3.66111111111e-05">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="nativeRefValue" datatype="double" value="32768.5">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="targetRefValue" datatype="double" value="2.05700100372">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="scale" datatype="double" value="3.66111111111e-05">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
       <!-- Data FIELDs -->
       <FIELD ID="_image-EVENTS_IMAGE" name="EVENTS_IMAGE" datatype="int"/>
       <DATA>

Modified: trunk/projects/dm/CubeDM-1.0/examples/chandra_2Dsky_image_annotated_byref.vot
==============================================================================
--- trunk/projects/dm/CubeDM-1.0/examples/chandra_2Dsky_image_annotated_byref.vot	Sat Apr 29 00:29:07 2017	(r3993)
+++ trunk/projects/dm/CubeDM-1.0/examples/chandra_2Dsky_image_annotated_byref.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -6,10 +6,6 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
-      <NAME>coordsys</NAME>
-      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml</URL>
-    </MODEL>
-    <MODEL>
       <NAME>cube</NAME>
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml</URL>
     </MODEL>
@@ -22,11 +18,15 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
       <NAME>trans</NAME>
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/trans/STCTrans-2.0.vo-dml.xml</URL>
     </MODEL>
     <GLOBALS>
-      <INSTANCE ID="_001J6U7FbgCwoWQF2" dmtype="ds:party.Organization">
+      <INSTANCE ID="_001J6U7FbgCwoWQF" dmtype="ds:party.Organization">
         <ATTRIBUTE dmrole="ds:party.Party.name">
           <CONSTANT ref="_001LrAjgQQfUzcfv" dmtype="ivoa:string"/>
         </ATTRIBUTE>
@@ -43,7 +43,7 @@
           <CONSTANT ref="_001gfnUmg1OEVIwq" dmtype="ivoa:anyURI"/>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE ID="_002J6U7FbgCwoWQF2" dmtype="ds:party.Individual">
+      <INSTANCE ID="_002J6U7FbgCwoWQF" dmtype="ds:party.Individual">
         <ATTRIBUTE dmrole="ds:party.Party.name">
           <CONSTANT ref="_002LrAjgQQfUzcfv" dmtype="ivoa:string"/>
         </ATTRIBUTE>
@@ -57,12 +57,12 @@
           <CONSTANT ref="_002dDUBXHoOSB9wX" dmtype="ivoa:string"/>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE ID="_0117pYWsEJmSbhJP2" dmtype="coordsys:domain.temporal.TimeFrame">
-        <COMPOSITION dmrole="coordsys:domain.temporal.TimeFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.temporal.CoordSpace1D">
-            <COMPOSITION dmrole="coordsys:domain.temporal.CoordSpace.axis"> 
-              <INSTANCE ID="_0118WLLnSEBj0p462" dmtype="coordsys:domain.temporal.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.temporal.CoordAxis.name">
+      <INSTANCE ID="_0117pYWsEJmSbhJP" dmtype="coords:domain.generic.GenericFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.generic.GenericCoordSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0118WLLnSEBj0p46" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0118cF2Rm82EU45n" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -70,27 +70,20 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010512XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_0105GrdyEo0SN7Ds" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <CONSTANT ref="_01051jiJzYdXI6UP" dmtype="coordsys:domain.spatial.StdRefFrame"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE ID="_010512XxjJ6d2Yfk" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <CONSTANT ref="_01051jiJzYdXI6UP" dmtype="coords:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0105OyyH8HFLPhaO" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0105bl4ryZpLwCUc" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -98,49 +91,42 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_01016p6qFkb1I2p72" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_010174BLUAVSMDVw" dmtype="coordsys:domain.spatial.StdRefPosition"/>
+      <INSTANCE ID="_01016p6qFkb1I2p7" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <CONSTANT ref="_01016u2XxjJ6d2Yf" dmtype="coords:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.equinox">
+          <INSTANCE dmtype="coords:domain.spatial.Epoch">
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.type">
+              <CONSTANT ref="_01017fNEHUi0m9rW" dmtype="coords:domain.spatial.EpochType"/>
             </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <CONSTANT ref="_01016u2XxjJ6d2Yf" dmtype="coordsys:domain.spatial.StdRefFrame"/>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.equinox">
-          <INSTANCE dmtype="coordsys:domain.spatial.Epoch">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.Epoch.type">
-              <CONSTANT ref="_01017fNEHUi0m9rW" dmtype="coordsys:domain.spatial.EpochType"/>
-            </ATTRIBUTE>
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.Epoch.year">
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.year">
               <CONSTANT ref="_01017foOjpZJkO0E" dmtype="ivoa:real"/>
             </ATTRIBUTE>
           </INSTANCE>
         </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Spherical">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE ID="_01017W9piipgxj8L2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Spherical">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_01017W9piipgxj8L" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_01017bl4ryZpLwCT" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_01017bl4ryZpLwCU" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_01017bx0oGeMSniE" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_01017cwvI7yS93aI2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_01017cwvI7yS93aI" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_01017e3zBfvt1YxJ" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_01017e3zBfvt1YxK" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_01017f0jRCn9ZYWE" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -148,27 +134,31 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_HPykZjnKKegGJhyB2" dmtype="coords:domain.spatial.Position2D">
-        <ATTRIBUTE dmrole="coords:domain.spatial.Position2D.coord">
-          <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-              <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
-            </ATTRIBUTE>
-            <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-              <IDREF>_01017W9piipgxj8L2</IDREF>
-            </REFERENCE>
-          </INSTANCE>
-          <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-              <CONSTANT ref="_HwTBlKFGp2MWVh1Q" dmtype="ivoa:RealQuantity"/>
+      <INSTANCE ID="_HPykZjnKKegGJhyB" dmtype="meas:Position2D">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+            <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_01017W9piipgxj8L</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <CONSTANT ref="_HwTBlKFGp2MWVh1Q" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_01017cwvI7yS93aI</IDREF>
+                </REFERENCE>
+              </INSTANCE>
             </ATTRIBUTE>
-            <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-              <IDREF>_01017cwvI7yS93aI2</IDREF>
-            </REFERENCE>
           </INSTANCE>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE dmtype="cube:NDImageDataset">
+      <INSTANCE dmtype="ds:experiment.ObsDataset">
         <ATTRIBUTE dmrole="ds:dataset.Dataset.dataProductType">
           <CONSTANT ref="_07Yrfb1KUNZfOEK8" dmtype="ds:dataset.DataProductType"/>
         </ATTRIBUTE>
@@ -178,10 +168,6 @@
         <ATTRIBUTE dmrole="ds:experiment.ObsDataset.calibLevel">
           <CONSTANT ref="_0GQQpjxvwn9XD0e1" dmtype="ivoa:integer"/>
         </ATTRIBUTE>
-        <COMPOSITION dmrole="ds:experiment.ObsDataset.characterisation"> 
-          <INSTANCE dmtype="ds:experiment.Characterisation">
-          </INSTANCE>
-        </COMPOSITION> 
         <COMPOSITION dmrole="ds:dataset.Dataset.curation"> 
           <INSTANCE dmtype="ds:dataset.Curation">
             <ATTRIBUTE dmrole="ds:dataset.Curation.publisherDID">
@@ -199,7 +185,7 @@
             <COMPOSITION dmrole="ds:dataset.Curation.contact"> 
               <INSTANCE dmtype="ds:dataset.Contact">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_002J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_002J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -209,7 +195,7 @@
                   <CONSTANT ref="_2FyzrxBRroXJYrrJ" dmtype="ivoa:anyURI"/>
                 </ATTRIBUTE>
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -255,14 +241,14 @@
                   <CONSTANT ref="_41oqw2x4Vn7JMqHy" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
             <COMPOSITION dmrole="ds:dataset.DataID.creator"> 
               <INSTANCE dmtype="ds:dataset.Creator">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -293,7 +279,7 @@
             <COMPOSITION dmrole="ds:experiment.ObsConfig.facility"> 
               <INSTANCE dmtype="ds:experiment.Facility">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -334,39 +320,32 @@
               <CONSTANT ref="_1JakggUBNfow3eQQ" dmtype="ivoa:real"/>
             </ATTRIBUTE>
             <REFERENCE dmrole="ds:experiment.BaseTarget.position">
-              <IDREF>_HPykZjnKKegGJhyB2</IDREF>
+              <IDREF>_HPykZjnKKegGJhyB</IDREF>
             </REFERENCE>
           </INSTANCE>
         </COMPOSITION> 
-        <REFERENCE dmrole="ds:experiment.ObsDataset.coordSys">
-          <IDREF>_6hrehomO3bIilaTo2</IDREF>
-          <IDREF>_A18RNKjFBdI7kMap2</IDREF>
-        </REFERENCE>
-        <REFERENCE dmrole="cube:NDImageDataset.image">
-          <IDREF>_A9OKA8Pw7UvuTGbF2</IDREF>
-        </REFERENCE>
       </INSTANCE>
-      <INSTANCE ID="_A9OKA8Pw7UvuTGbF2" dmtype="cube:NDImage">
+      <INSTANCE dmtype="cube:NDImage">
         <COMPOSITION dmrole="cube:PixelatedDataProduct.pixelCoordSys"> 
-          <INSTANCE dmtype="cube:PixelCoordSys">
-            <COMPOSITION dmrole="coordsys:PixelCoordSystem.pixelFrame"> 
-              <INSTANCE ID="_LPb9Mqr4SAtLO7E52" dmtype="coordsys:domain.pixel.PixelFrame">
-                <COMPOSITION dmrole="coordsys:domain.pixel.PixelFrame.coordSpace"> 
-                  <INSTANCE dmtype="coordsys:domain.pixel.PixelSpace">
-                    <COMPOSITION dmrole="coordsys:domain.pixel.CoordSpace.axis"> 
-                      <INSTANCE dmtype="coordsys:domain.pixel.PixelAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.name">
+          <INSTANCE dmtype="coords:PixelCoordSystem">
+            <COMPOSITION dmrole="coords:PixelCoordSystem.pixelFrame"> 
+              <INSTANCE ID="_LPb9Mqr4SAtLO7E5" dmtype="coords:domain.pixel.PixelFrame">
+                <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+                  <INSTANCE dmtype="coords:domain.pixel.PixelSpace">
+                    <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+                      <INSTANCE dmtype="coords:domain.pixel.PixelAxis">
+                        <ATTRIBUTE dmrole="coords:Axis.name">
                           <CONSTANT ref="_LdxzKNzOz1uHnhAz" dmtype="ivoa:string"/>
                         </ATTRIBUTE>
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.length">
+                        <ATTRIBUTE dmrole="coords:domain.pixel.PixelAxis.numPix">
                           <CONSTANT ref="_LesqzfVMOKQ3sJxf" dmtype="ivoa:nonnegativeInteger"/>
                         </ATTRIBUTE>
                       </INSTANCE>
-                      <INSTANCE dmtype="coordsys:domain.pixel.PixelAxis">
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.name">
+                      <INSTANCE dmtype="coords:domain.pixel.PixelAxis">
+                        <ATTRIBUTE dmrole="coords:Axis.name">
                           <CONSTANT ref="_Lj2OYmlKYrOmQPYj" dmtype="ivoa:string"/>
                         </ATTRIBUTE>
-                        <ATTRIBUTE dmrole="coordsys:domain.pixel.PixelAxis.length">
+                        <ATTRIBUTE dmrole="coords:domain.pixel.PixelAxis.numPix">
                           <CONSTANT ref="_LlXCBJeUaO4nydSp" dmtype="ivoa:nonnegativeInteger"/>
                         </ATTRIBUTE>
                       </INSTANCE>
@@ -378,20 +357,34 @@
           </INSTANCE>
         </COMPOSITION> 
         <COMPOSITION dmrole="cube:DataProduct.coordSys"> 
-          <INSTANCE ID="_6hrehomO3bIilaTo2" dmtype="cube:CoordSys">
-            <REFERENCE dmrole="coordsys:CoordSys.genericFrame">
-              <IDREF>_0117pYWsEJmSbhJP2</IDREF>
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <CONSTANT ref="_010174BLUAVSMDVw" dmtype="coords:domain.spatial.StdRefPosition"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:CoordSys.genericFrame">
+              <IDREF>_0117pYWsEJmSbhJP</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spaceFrame">
-              <IDREF>_010512XxjJ6d2Yfk2</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_010512XxjJ6d2Yfk</IDREF>
             </REFERENCE>
           </INSTANCE>
-          <INSTANCE ID="_A18RNKjFBdI7kMap2" dmtype="cube:CoordSys">
-            <REFERENCE dmrole="coordsys:CoordSys.genericFrame">
-              <IDREF>_0117pYWsEJmSbhJP2</IDREF>
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <CONSTANT ref="_010174BLUAVSMDVw" dmtype="coords:domain.spatial.StdRefPosition"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:CoordSys.genericFrame">
+              <IDREF>_0117pYWsEJmSbhJP</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spaceFrame">
-              <IDREF>_01016p6qFkb1I2p72</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_01016p6qFkb1I2p7</IDREF>
             </REFERENCE>
           </INSTANCE>
         </COMPOSITION> 
@@ -511,10 +504,10 @@
                   </INSTANCE>
                 </COMPOSITION> 
                 <REFERENCE dmrole="trans:FrameTransform.nativeFrame">
-                  <IDREF>_LPb9Mqr4SAtLO7E52</IDREF>
+                  <IDREF>_LPb9Mqr4SAtLO7E5</IDREF>
                 </REFERENCE>
                 <REFERENCE dmrole="trans:FrameTransform.targetFrame">
-                  <IDREF>_010512XxjJ6d2Yfk2</IDREF>
+                  <IDREF>_010512XxjJ6d2Yfk</IDREF>
                 </REFERENCE>
               </INSTANCE>
               <INSTANCE dmtype="trans:FrameTransform">
@@ -550,10 +543,10 @@
                   </INSTANCE>
                 </COMPOSITION> 
                 <REFERENCE dmrole="trans:FrameTransform.nativeFrame">
-                  <IDREF>_010512XxjJ6d2Yfk2</IDREF>
+                  <IDREF>_010512XxjJ6d2Yfk</IDREF>
                 </REFERENCE>
                 <REFERENCE dmrole="trans:FrameTransform.targetFrame">
-                  <IDREF>_01016p6qFkb1I2p72</IDREF>
+                  <IDREF>_01016p6qFkb1I2p7</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -565,409 +558,205 @@
       </INSTANCE>
     </GLOBALS>
     <TEMPLATES tableref="_table1">
+        <INSTANCE ID="_AK9CaKnrQwqiiyvn3" dmtype="cube:Voxel">
+          <COMPOSITION dmrole="cube:DataElement.axis"> 
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="True"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:GenericCoordMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.generic.GenericCoordValue">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                        <COLUMN ref="_image-EVENTS_IMAGE" dmtype="ivoa:IntegerQuantity"/>
+                      </ATTRIBUTE>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0118WLLnSEBj0p46</IDREF>
+                      </REFERENCE>
+                    </INSTANCE>
+                  </ATTRIBUTE>
+                </INSTANCE>
+              </COMPOSITION> 
+            </INSTANCE>
+          </COMPOSITION> 
+        </INSTANCE>
     </TEMPLATES>
   </VODML>
   <RESOURCE>
     <TABLE ID="_table1">
-      <GROUP ID="_001J6U7FbgCwoWQF" name="SAO">
-        <DESCRIPTION>Smithsonian Astrophysical Observatory</DESCRIPTION>
-        <PARAM ID="_001LrAjgQQfUzcfv" name="name" datatype="char" arraysize="24" value="The Chandra X-Ray Center"/>
-        <PARAM ID="_001QE4mxmePP6gt9" name="address" datatype="char" arraysize="41" value="60 Garden Street, Cambridge, MA 02138 USA"/>
-        <PARAM ID="_001R0jW5TKzkQ8Lz" name="email" datatype="char" arraysize="27" ucd="meta.ref.url;meta.email" value="cxcweb at head.cfa.harvard.edu"/>
-        <PARAM ID="_001dDUBXHoOSB9wX" name="phone" datatype="char" arraysize="12" value="617-496-7941"/>
-        <PARAM ID="_001gfnUmg1OEVIwq" name="logo" datatype="char" arraysize="52" ucd="meta.ref.url" value="http://chandra.si.edu/graphics/top/icon_cxc_foot.jpg"/>
-      </GROUP>
-      <GROUP ID="_002J6U7FbgCwoWQF" name="CXCHelpdesk">
-        <DESCRIPTION>Contact Individual</DESCRIPTION>
-        <PARAM ID="_002LrAjgQQfUzcfv" name="name" datatype="char" arraysize="19" value="CXC HelpDesk System"/>
-        <PARAM ID="_002QE4mxmePP6gt9" name="address" datatype="char" arraysize="3" value="N/A"/>
-        <PARAM ID="_002R0jW5TKzkQ8Lz" name="email" datatype="char" arraysize="28" ucd="meta.ref.url;meta.email" value="cxchelp at head.cfa.harvard.edu"/>
-        <PARAM ID="_002dDUBXHoOSB9wX" name="phone" datatype="char" arraysize="3" value="N/A"/>
-      </GROUP>
-      <GROUP ID="_0117pYWsEJmSbhJP" name="GenericFrame">
-        <DESCRIPTION>Image data value frame</DESCRIPTION>
-        <GROUP name="GenericFrame_CoordSpace">
-          <DESCRIPTION>Image value coordinate space</DESCRIPTION>
-          <GROUP ID="_0118WLLnSEBj0p46" name="Image_CoordAxis">
-            <DESCRIPTION>Image value axis</DESCRIPTION>
-            <PARAM ID="_0118cF2Rm82EU45n" name="name" datatype="char" arraysize="6" value="counts"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010512XxjJ6d2Yfk" name="SkyFrame">
-        <DESCRIPTION>SKY - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM ID="_0105GrdyEo0SN7Ds" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM ID="_01051jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="SkyFrame_CoordSpace">
-          <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
-          <GROUP name="Sky_X-Axis">
-            <DESCRIPTION>x axis</DESCRIPTION>
-            <PARAM ID="_0105OyyH8HFLPhaO" name="name" datatype="char" arraysize="1" value="x"/>
-          </GROUP>
-          <GROUP name="Sky_Y-Axis">
-            <DESCRIPTION>y axis</DESCRIPTION>
-            <PARAM ID="_0105bl4ryZpLwCUc" name="name" datatype="char" arraysize="1" value="y"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_01016p6qFkb1I2p7" name="ICRSFrame">
-        <DESCRIPTION>EQPOS - World spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM ID="_010174BLUAVSMDVw" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM ID="_01016u2XxjJ6d2Yf" name="orientation" datatype="char" arraysize="4" value="ICRS"/>
-        <GROUP name="equinox">
-          <PARAM ID="_01017fNEHUi0m9rW" name="type" datatype="char" arraysize="1" value="J"/>
-          <PARAM ID="_01017foOjpZJkO0E" name="year" datatype="double" value="2000.0"/>
-        </GROUP>
-        <GROUP name="ICRSFrame_CoordSpace">
-          <DESCRIPTION>Spherical coordinate space</DESCRIPTION>
-          <GROUP ID="_01017W9piipgxj8L" name="ICRS_RA-Axis">
-            <DESCRIPTION>ra axis</DESCRIPTION>
-            <PARAM ID="_01017bl4ryZpLwCT" name="name" datatype="char" arraysize="2" value="ra"/>
-            <PARAM ID="_01017bl4ryZpLwCU" name="domainMin" datatype="double" value="0.0" unit="deg"/>
-            <PARAM ID="_01017bx0oGeMSniE" name="domainMax" datatype="double" value="360.0" unit="deg"/>
-          </GROUP>
-          <GROUP ID="_01017cwvI7yS93aI" name="ICRS_DEC-Axis">
-            <DESCRIPTION>dec axis</DESCRIPTION>
-            <PARAM ID="_01017e3zBfvt1YxJ" name="name" datatype="char" arraysize="3" value="dec"/>
-            <PARAM ID="_01017e3zBfvt1YxK" name="domainMin" datatype="double" value="-90.0" unit="deg"/>
-            <PARAM ID="_01017f0jRCn9ZYWE" name="domainMax" datatype="double" value="+90.0" unit="deg"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_HPykZjnKKegGJhyB" name="TargetPosition">
-        <GROUP name="coord">
-          <PARAM ID="_HhKAdKcKlhfiUsag" name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_RA-Axis"/>
-        </GROUP>
-        <GROUP name="coord">
-          <PARAM ID="_HwTBlKFGp2MWVh1Q" name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_DEC-Axis"/>
-        </GROUP>
-      </GROUP>
-      <GROUP name="NDImageDataset">
-        <DESCRIPTION>N-Dimensional Image Dataset</DESCRIPTION>
-        <PARAM ID="_07Yrfb1KUNZfOEK8" name="dataProductType" datatype="char" arraysize="5" ucd="meta.id" value="IMAGE">
-          <DESCRIPTION>Dataset type</DESCRIPTION>
-        </PARAM>
-        <PARAM ID="_0DcwmCqLzkpXADh4" name="dataProductSubtype" datatype="char" arraysize="18" ucd="meta.id" value="2D Pixelated Image">
-          <DESCRIPTION>Dataset subtype</DESCRIPTION>
-        </PARAM>
-        <PARAM ID="_0GQQpjxvwn9XD0e1" name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
-          <DESCRIPTION>Calibration level</DESCRIPTION>
-        </PARAM>
-        <GROUP name="Characterisation">
-          <DESCRIPTION>Characteristics of data coordinate space</DESCRIPTION>
-        </GROUP>
-        <GROUP name="Curation">
-          <DESCRIPTION>Dataset curation metadata</DESCRIPTION>
-          <PARAM ID="_1O5vXPfA8U80BgHg" name="publisherDID" datatype="char" arraysize="20" ucd="meta.ref.url;meta.curation" value="ADS/Sa.CXO#obs/00460">
-            <DESCRIPTION>Publisher specified dataset ID</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1UfAoyYjyHKhMD0H" name="version" datatype="char" arraysize="1" ucd="meta.version;meta.curation" value="5">
-            <DESCRIPTION>Publisher version of the dataset</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1XoOkGpCBycuUMNg" name="releaseDate" datatype="char" arraysize="19" ucd="time.release" value="2014-09-16T21:33:56">
-            <DESCRIPTION>Date curated dataset last modified time.release</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1Yy1BxGML9rCbZm0" name="rights" datatype="char" arraysize="6" ucd="meta.code" value="PUBLIC">
-            <DESCRIPTION>Level of access granted</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Contact">
-            <DESCRIPTION>Contact entity for curation service</DESCRIPTION>
-            <GROUP ref="_002J6U7FbgCwoWQF" name="REF_CXCHelpdesk">
-              <DESCRIPTION>Entity associated with Contact role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Publisher">
-            <DESCRIPTION>Publisher</DESCRIPTION>
-            <PARAM ID="_2FyzrxBRroXJYrrJ" name="publisherID" datatype="char" arraysize="3" ucd="meta.ref.url;meta.curation" value="TBD">
-              <DESCRIPTION>URI for VO Publisher</DESCRIPTION>
-            </PARAM>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Entity associated with Publisher role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Publication">
-            <DESCRIPTION>Reference to publication associated with the dataset</DESCRIPTION>
-            <PARAM ID="_39TH5KgHQA2gDNx7" name="refCode" datatype="char" arraysize="19" ucd="meta.bib.bibcode" value="YYYYJJJJJVVVVMPPPPA">
-              <DESCRIPTION>URL or Bibcode of the publication</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="DataID">
-          <DESCRIPTION>Dataset identification metadata</DESCRIPTION>
-          <PARAM ID="_3BP3wPIobUK2MMPb" name="title" datatype="char" arraysize="78" ucd="meta.title;meta.dataset" value="IN FLIGHT CALIBRATION OF THE HETGS EFFECTIVE AREA AND CROSS DISPERSION PROFILE">
-            <DESCRIPTION>Dataset Title</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_3Ko2JyvGSnp9kPFC" name="datasetID" datatype="char" arraysize="20" ucd="meta.id;meta.dataset" value="ADS/Sa.CXO#obs/00460">
-            <DESCRIPTION>IVOA Dataset Identifier</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_3MNpvGqLmbAgJ0iO" name="creatorDID" datatype="char" arraysize="20" ucd="meta.id" value="ADS/Sa.CXO#obs/00460">
-            <DESCRIPTION>Creator defined Dataset Identifier</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_3czgnsjeBuaz1VA6" name="version" datatype="char" arraysize="1" ucd="meta.version;meta.dataset" value="5">
-            <DESCRIPTION>Dataset version assigned by creator</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_3kusBO5Vi7a8i2Bs" name="date" datatype="char" arraysize="19" ucd="time.epoch;meta.dataset" value="2014-09-16T21:33:56">
-            <DESCRIPTION>Data processing/creation date</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_3lBLZy5MGZtbq6z1" name="creationType" datatype="char" arraysize="8" value="ARCHIVAL">
-            <DESCRIPTION>Dataset creation type</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Collection">
-            <DESCRIPTION>Collection to which the dataset is a member</DESCRIPTION>
-            <PARAM ID="_3zibPIoz0P3g6Vg9" name="name" datatype="char" arraysize="7" value="Chandra">
-              <DESCRIPTION>Collection name</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-          <GROUP name="Contributor">
-            <DESCRIPTION>Contributor</DESCRIPTION>
-            <PARAM ID="_41oqw2x4Vn7JMqHy" name="acknowledgment" datatype="char" arraysize="129" value="CIAO: Chandra's data analysis system (ADS, PS); Fruscione et al. 2006, SPIE Proc. 6270, 62701V, D.R. Silvia and R.E. Doxsey, eds.">
-              <DESCRIPTION>Acknowledgment expression for the contributor</DESCRIPTION>
-            </PARAM>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Individual associated with Contributor role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Creator">
-            <DESCRIPTION>Institution or entity which created the dataset</DESCRIPTION>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Individual associated with the Creator role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Derived">
-          <DESCRIPTION>Derived metadata</DESCRIPTION>
-          <GROUP name="ONTIME">
-            <DESCRIPTION>property derived from analysis of data content</DESCRIPTION>
-            <PARAM ID="_5SLMkv4jJLqDeTHa" name="name" datatype="char" arraysize="8" value="EXPOSURE">
-              <DESCRIPTION>Total exposure time, with all known corrections</DESCRIPTION>
-            </PARAM>
-            <PARAM ID="_5UKRXkncAyseKMgT" name="value" datatype="double" value="39930.0463526">
-              <DESCRIPTION>value of derived property</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="ObsConfig">
-          <DESCRIPTION>ObsConfig Object</DESCRIPTION>
-          <PARAM ID="_5UozFhanJugquCM1" name="bandpass" datatype="char" arraysize="4" ucd="instr.bandpass" value="XRAY">
-            <DESCRIPTION>General regime in spectral domain</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_5YfO8GkjuqSEqt2s" name="datasource" datatype="char" arraysize="7" value="POINTED">
-            <DESCRIPTION>Original source/type of data</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Facility">
-            <DESCRIPTION>Metadata for the facility performing the observation</DESCRIPTION>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Organization responsible for performing the observation</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Instrument">
-            <DESCRIPTION>Metadata for the Instrument which created the data</DESCRIPTION>
-            <PARAM ID="_60HpJl6Eph8CdiKZ" name="name" datatype="char" arraysize="7" ucd="meta.id;instr" value="CHANDRA">
-              <DESCRIPTION>Instrument ID</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Proposal">
-          <DESCRIPTION>Proposal Object</DESCRIPTION>
-          <PARAM ID="_60NnazyCoAERdJZn" name="identifier" datatype="char" arraysize="8" ucd="meta.id;obs.proposal" value="12345678">
-            <DESCRIPTION>Proposal ID</DESCRIPTION>
-          </PARAM>
-        </GROUP>
-        <GROUP name="AstroTarget">
-          <DESCRIPTION>AstroTarget Object</DESCRIPTION>
-          <PARAM ID="_0ylm8ZmZQyFkdnQ5" name="name" datatype="char" arraysize="6" ucd="meta.id;src" value="3C 273">
-            <DESCRIPTION>Target name</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_17h6AWop4BLek351" name="description" datatype="char" arraysize="3" ucd="meta.note;src" value="TBD">
-            <DESCRIPTION>Target descriptive text</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_17uibvmtc6H9lpWs" name="objectClass" datatype="char" arraysize="3" ucd="src.class" value="TBD">
-            <DESCRIPTION>Target or object class</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1CJrcE00bxzwh5x2" name="spectralClass" datatype="char" arraysize="3" ucd="src.spType" value="TBD">
-            <DESCRIPTION>Object spectral class</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1H6gBwZiDI8Xwnbb" name="redshift" datatype="double" ucd="src.redshift" value="NaN">
-            <DESCRIPTION>Target redshift</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1JakggUBNfow3eQQ" name="varAmpl" datatype="double" value="NaN">
-            <DESCRIPTION>Target variability amplitude - typical</DESCRIPTION>
-          </PARAM>
-          <GROUP ref="_HPykZjnKKegGJhyB" name="REF_TargetPosition">
-            <DESCRIPTION>Target location (eg: RA, DEC)</DESCRIPTION>
-          </GROUP>
-        </GROUP>
-        <GROUP ref="_6hrehomO3bIilaTo" name="REF_CoordSys-Phys">
-          <DESCRIPTION>Global coordinate systems (Physical)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A18RNKjFBdI7kMap" name="REF_CoordSys-World">
-          <DESCRIPTION>Global coordinate systems (World)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A9OKA8Pw7UvuTGbF" name="REF_NDImage">
-          <DESCRIPTION>Image data</DESCRIPTION>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_A9OKA8Pw7UvuTGbF" name="NDImage">
-        <GROUP name="PixelCoordSys">
-          <DESCRIPTION>Pixel Coordinate System</DESCRIPTION>
-          <GROUP ID="_LPb9Mqr4SAtLO7E5" name="PixelFrame">
-            <DESCRIPTION>2D Pixel Frame</DESCRIPTION>
-            <GROUP name="PixelSpace">
-              <DESCRIPTION>Pixel Coordinate Space</DESCRIPTION>
-              <GROUP name="Pixel_Axis1">
-                <PARAM ID="_LdxzKNzOz1uHnhAz" name="name" datatype="char" arraysize="2" value="#1"/>
-                <PARAM ID="_LesqzfVMOKQ3sJxf" name="length" datatype="long" value="50"/>
-              </GROUP>
-              <GROUP name="Pixel_Axis2">
-                <PARAM ID="_Lj2OYmlKYrOmQPYj" name="name" datatype="char" arraysize="2" value="#2"/>
-                <PARAM ID="_LlXCBJeUaO4nydSp" name="length" datatype="long" value="100"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP ID="_6hrehomO3bIilaTo" name="CoordSys-Phys">
-          <DESCRIPTION>Physical Coordinate System</DESCRIPTION>
-          <GROUP ref="_0117pYWsEJmSbhJP" name="REF_GenericFrame"/>
-          <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame"/>
-        </GROUP>
-        <GROUP ID="_A18RNKjFBdI7kMap" name="CoordSys-World">
-          <DESCRIPTION>World Coordinate System</DESCRIPTION>
-          <GROUP ref="_0117pYWsEJmSbhJP" name="REF_GenericFrame"/>
-          <GROUP ref="_01016p6qFkb1I2p7" name="REF_ICRSFrame"/>
-        </GROUP>
-        <GROUP name="Mappings">
-          <DESCRIPTION>Frame Transforms</DESCRIPTION>
-          <GROUP name="PIX2SKY">
-            <DESCRIPTION>Pix-to-Sky Transform</DESCRIPTION>
-            <GROUP name="PIX2SKY_TMatrix">
-              <DESCRIPTION>Matrix Transform</DESCRIPTION>
-              <PARAM ID="_F0tnCu4Jhe6TDSxx" name="M" datatype="long" value="3">
-                <DESCRIPTION>MxN Matrix size - M</DESCRIPTION>
-              </PARAM>
-              <PARAM ID="_F0tnCu4Jhe6TDSxy" name="N" datatype="long" value="3">
-                <DESCRIPTION>MxN Matrix size - N</DESCRIPTION>
-              </PARAM>
-              <GROUP name="PIX2SKY_TMatrixElement00">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM ID="_FloO5XpCpdpUOIgw" name="m" datatype="long" value="0"/>
-                <PARAM ID="_Fp7ER1qgvfCLjUUP" name="n" datatype="long" value="0"/>
-                <PARAM ID="_FqpkK3H6Kn6d1Z2Y" name="value" datatype="double" value="100.0"/>
-              </GROUP>
-              <GROUP name="PIX2SKY_TMatrixElement01">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM ID="_FsMLg6XzuyypOIfH" name="m" datatype="long" value="0"/>
-                <PARAM ID="_Fy2g4MYUgvRH3xzm" name="n" datatype="long" value="1"/>
-                <PARAM ID="_FyxRPdyStXOsU4r1" name="value" datatype="double" value="0.0"/>
-              </GROUP>
-              <GROUP name="PIX2SKY_TMatrixElement02">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM ID="_G5W2cK3j7if3b8V2" name="m" datatype="long" value="0"/>
-                <PARAM ID="_G7WNkyY9QmQIKBw2" name="n" datatype="long" value="2"/>
-                <PARAM ID="_GDiouLisSEJYAqb0" name="value" datatype="double" value="0.0"/>
-              </GROUP>
-              <GROUP name="PIX2SKY_TMatrixElement10">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM ID="_GGKP5LkbUuQkM12V" name="m" datatype="long" value="1"/>
-                <PARAM ID="_GKJ0Y2OEe3Wy9AJD" name="n" datatype="long" value="0"/>
-                <PARAM ID="_GLAyd5qIvQAqRVRC" name="value" datatype="double" value="-0.0"/>
-              </GROUP>
-              <GROUP name="PIX2SKY_TMatrixElement11">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM ID="_GSHsEyQJOPDZMEKQ" name="m" datatype="long" value="1"/>
-                <PARAM ID="_GULPvc7i2t1st2kp" name="n" datatype="long" value="1"/>
-                <PARAM ID="_GVOLhYwZhCFscPq3" name="value" datatype="double" value="100.0"/>
-              </GROUP>
-              <GROUP name="PIX2SKY_TMatrixElement12">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM ID="_GZyLtKEf2IMcO7xF" name="m" datatype="long" value="1"/>
-                <PARAM ID="_GaowwGKYjnuWyGZQ" name="n" datatype="long" value="2"/>
-                <PARAM ID="_Ge6cdqVJ4z8hocpi" name="value" datatype="double" value="0.0"/>
-              </GROUP>
-              <GROUP name="PIX2SKY_TMatrixElement20">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM ID="_GmJDTZFyigwgHF3x" name="m" datatype="long" value="2"/>
-                <PARAM ID="_Gp1V3caUBg0HDNCQ" name="n" datatype="long" value="0"/>
-                <PARAM ID="_GsEM0S0SF95JdN6i" name="value" datatype="double" value="29950.0"/>
-              </GROUP>
-              <GROUP name="PIX2SKY_TMatrixElement21">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM ID="_Gtixm4wdUQLWho6k" name="m" datatype="long" value="2"/>
-                <PARAM ID="_GuIEkvZ1xjRnl3CV" name="n" datatype="long" value="1"/>
-                <PARAM ID="_GuRyWQ5lr2wlxUkx" name="value" datatype="double" value="29950.0"/>
-              </GROUP>
-              <GROUP name="PIX2SKY_TMatrixElement22">
-                <DESCRIPTION>Matrix Element</DESCRIPTION>
-                <PARAM ID="_H7UsxPJCn7MYdF3C" name="m" datatype="long" value="2"/>
-                <PARAM ID="_HDu087mE9OwLmyyh" name="n" datatype="long" value="2"/>
-                <PARAM ID="_HHHhNqc55VYb1dYx" name="value" datatype="double" value="1.0"/>
-              </GROUP>
-            </GROUP>
-            <GROUP ref="_LPb9Mqr4SAtLO7E5" name="REF_PixelFrame">
-              <DESCRIPTION>Originating Frame (pixel)</DESCRIPTION>
-            </GROUP>
-            <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame">
-              <DESCRIPTION>Resulting Frame (sky)</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="SKY2EQPOS">
-            <DESCRIPTION>Sky-to-EQPOS Transform</DESCRIPTION>
-            <GROUP name="SKY2EQPOS_Projection">
-              <DESCRIPTION>WCS Projection instance</DESCRIPTION>
-              <PARAM ID="_M2GlcXZVSiJplxAz" name="algorithm" datatype="char" arraysize="3" value="TAN">
-                <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
-              </PARAM>
-              <GROUP name="SKY2EQPOS_AXIS1">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM ID="_M3wPLdgNb6AmcarD" name="nativeRefValue" datatype="double" value="32768.5">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_M3wtrSyf9qMAAFIk" name="targetRefValue" datatype="double" value="187.280152947">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_M40aE6wVGaNtSojR" name="scale" datatype="double" value="-3.66111111111e-05">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-              <GROUP name="SKY2EQPOS_AXIS2">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM ID="_M4u9k8u8Jo3wSffi" name="nativeRefValue" datatype="double" value="32768.5">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_M53niMh2XAO0IBg3" name="targetRefValue" datatype="double" value="2.05700100372">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_M5SOA0YK3fVcaZen" name="scale" datatype="double" value="3.66111111111e-05">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-            </GROUP>
-            <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame">
-              <DESCRIPTION>Originating Frame (sky)</DESCRIPTION>
-            </GROUP>
-            <GROUP ref="_01016p6qFkb1I2p7" name="REF_ICRSFrame">
-              <DESCRIPTION>Resulting Frame (eqpos)</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Voxel">
-          <GROUP name="ImageDataAxis">
-            <DESCRIPTION>Image voxel dependent axis</DESCRIPTION>
-            <GROUP name="ImageData">
-              <DESCRIPTION>Image voxel value (observable)</DESCRIPTION>
-              <GROUP name="coord">
-                <FIELDref ref="_image-EVENTS_IMAGE"/>
-                <GROUP ref="_0118WLLnSEBj0p46" name="REF_Image_CoordAxis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-      </GROUP>
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM ID="_001LrAjgQQfUzcfv" name="name" datatype="char" arraysize="24" value="The Chandra X-Ray Center"/>
+      <PARAM ID="_001QE4mxmePP6gt9" name="address" datatype="char" arraysize="41" value="60 Garden Street, Cambridge, MA 02138 USA"/>
+      <PARAM ID="_001R0jW5TKzkQ8Lz" name="email" datatype="char" arraysize="27" ucd="meta.ref.url;meta.email" value="cxcweb at head.cfa.harvard.edu"/>
+      <PARAM ID="_001dDUBXHoOSB9wX" name="phone" datatype="char" arraysize="12" value="617-496-7941"/>
+      <PARAM ID="_001gfnUmg1OEVIwq" name="logo" datatype="char" arraysize="52" ucd="meta.ref.url" value="http://chandra.si.edu/graphics/top/icon_cxc_foot.jpg"/>
+      <PARAM ID="_002LrAjgQQfUzcfv" name="name" datatype="char" arraysize="19" value="CXC HelpDesk System"/>
+      <PARAM ID="_002QE4mxmePP6gt9" name="address" datatype="char" arraysize="3" value="N/A"/>
+      <PARAM ID="_002R0jW5TKzkQ8Lz" name="email" datatype="char" arraysize="28" ucd="meta.ref.url;meta.email" value="cxchelp at head.cfa.harvard.edu"/>
+      <PARAM ID="_002dDUBXHoOSB9wX" name="phone" datatype="char" arraysize="3" value="N/A"/>
+      <PARAM ID="_0118cF2Rm82EU45n" name="name" datatype="char" arraysize="6" value="counts"/>
+      <PARAM ID="_01051jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM ID="_0105OyyH8HFLPhaO" name="name" datatype="char" arraysize="1" value="x"/>
+      <PARAM ID="_0105bl4ryZpLwCUc" name="name" datatype="char" arraysize="1" value="y"/>
+      <PARAM ID="_01016u2XxjJ6d2Yf" name="orientation" datatype="char" arraysize="4" value="ICRS"/>
+      <PARAM ID="_01017fNEHUi0m9rW" name="type" datatype="char" arraysize="1" value="J"/>
+      <PARAM ID="_01017foOjpZJkO0E" name="year" datatype="double" value="2000.0"/>
+      <PARAM ID="_01017bl4ryZpLwCT" name="name" datatype="char" arraysize="2" value="ra"/>
+      <PARAM ID="_01017bl4ryZpLwCU" name="domainMin" datatype="double" value="0.0" unit="deg"/>
+      <PARAM ID="_01017bx0oGeMSniE" name="domainMax" datatype="double" value="360.0" unit="deg"/>
+      <PARAM ID="_01017e3zBfvt1YxJ" name="name" datatype="char" arraysize="3" value="dec"/>
+      <PARAM ID="_01017e3zBfvt1YxK" name="domainMin" datatype="double" value="-90.0" unit="deg"/>
+      <PARAM ID="_01017f0jRCn9ZYWE" name="domainMax" datatype="double" value="+90.0" unit="deg"/>
+      <PARAM ID="_HhKAdKcKlhfiUsag" name="targ_ra" datatype="double" value="NaN"/>
+      <PARAM ID="_HwTBlKFGp2MWVh1Q" name="targ_dec" datatype="double" value="NaN"/>
+      <PARAM ID="_07Yrfb1KUNZfOEK8" name="dataProductType" datatype="char" arraysize="5" ucd="meta.id" value="IMAGE">
+        <DESCRIPTION>Dataset type</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_0DcwmCqLzkpXADh4" name="dataProductSubtype" datatype="char" arraysize="18" ucd="meta.id" value="2D Pixelated Image">
+        <DESCRIPTION>Dataset subtype</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_0GQQpjxvwn9XD0e1" name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
+        <DESCRIPTION>Calibration level</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1O5vXPfA8U80BgHg" name="publisherDID" datatype="char" arraysize="20" ucd="meta.ref.url;meta.curation" value="ADS/Sa.CXO#obs/00460">
+        <DESCRIPTION>Publisher specified dataset ID</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1UfAoyYjyHKhMD0H" name="version" datatype="char" arraysize="1" ucd="meta.version;meta.curation" value="5">
+        <DESCRIPTION>Publisher version of the dataset</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1XoOkGpCBycuUMNg" name="releaseDate" datatype="char" arraysize="19" ucd="time.release" value="2014-09-16T21:33:56">
+        <DESCRIPTION>Date curated dataset last modified time.release</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1Yy1BxGML9rCbZm0" name="rights" datatype="char" arraysize="6" ucd="meta.code" value="PUBLIC">
+        <DESCRIPTION>Level of access granted</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_2FyzrxBRroXJYrrJ" name="publisherID" datatype="char" arraysize="3" ucd="meta.ref.url;meta.curation" value="TBD">
+        <DESCRIPTION>URI for VO Publisher</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_39TH5KgHQA2gDNx7" name="refCode" datatype="char" arraysize="19" ucd="meta.bib.bibcode" value="YYYYJJJJJVVVVMPPPPA">
+        <DESCRIPTION>URL or Bibcode of the publication</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3BP3wPIobUK2MMPb" name="title" datatype="char" arraysize="78" ucd="meta.title;meta.dataset" value="IN FLIGHT CALIBRATION OF THE HETGS EFFECTIVE AREA AND CROSS DISPERSION PROFILE">
+        <DESCRIPTION>Dataset Title</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3Ko2JyvGSnp9kPFC" name="datasetID" datatype="char" arraysize="20" ucd="meta.id;meta.dataset" value="ADS/Sa.CXO#obs/00460">
+        <DESCRIPTION>IVOA Dataset Identifier</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3MNpvGqLmbAgJ0iO" name="creatorDID" datatype="char" arraysize="20" ucd="meta.id" value="ADS/Sa.CXO#obs/00460">
+        <DESCRIPTION>Creator defined Dataset Identifier</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3czgnsjeBuaz1VA6" name="version" datatype="char" arraysize="1" ucd="meta.version;meta.dataset" value="5">
+        <DESCRIPTION>Dataset version assigned by creator</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3kusBO5Vi7a8i2Bs" name="date" datatype="char" arraysize="19" ucd="time.epoch;meta.dataset" value="2014-09-16T21:33:56">
+        <DESCRIPTION>Data processing/creation date</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3lBLZy5MGZtbq6z1" name="creationType" datatype="char" arraysize="8" value="ARCHIVAL">
+        <DESCRIPTION>Dataset creation type</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3zibPIoz0P3g6Vg9" name="name" datatype="char" arraysize="7" value="Chandra">
+        <DESCRIPTION>Collection name</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_41oqw2x4Vn7JMqHy" name="acknowledgment" datatype="char" arraysize="129" value="CIAO: Chandra's data analysis system (ADS, PS); Fruscione et al. 2006, SPIE Proc. 6270, 62701V, D.R. Silvia and R.E. Doxsey, eds.">
+        <DESCRIPTION>Acknowledgment expression for the contributor</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_5SLMkv4jJLqDeTHa" name="name" datatype="char" arraysize="8" value="EXPOSURE">
+        <DESCRIPTION>Total exposure time, with all known corrections</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_5UKRXkncAyseKMgT" name="value" datatype="double" value="39930.0463526">
+        <DESCRIPTION>value of derived property</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_5UozFhanJugquCM1" name="bandpass" datatype="char" arraysize="4" ucd="instr.bandpass" value="XRAY">
+        <DESCRIPTION>General regime in spectral domain</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_5YfO8GkjuqSEqt2s" name="datasource" datatype="char" arraysize="7" value="POINTED">
+        <DESCRIPTION>Original source/type of data</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_60HpJl6Eph8CdiKZ" name="name" datatype="char" arraysize="7" ucd="meta.id;instr" value="CHANDRA">
+        <DESCRIPTION>Instrument ID</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_60NnazyCoAERdJZn" name="identifier" datatype="char" arraysize="8" ucd="meta.id;obs.proposal" value="12345678">
+        <DESCRIPTION>Proposal ID</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_0ylm8ZmZQyFkdnQ5" name="name" datatype="char" arraysize="6" ucd="meta.id;src" value="3C 273">
+        <DESCRIPTION>Target name</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_17h6AWop4BLek351" name="description" datatype="char" arraysize="3" ucd="meta.note;src" value="TBD">
+        <DESCRIPTION>Target descriptive text</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_17uibvmtc6H9lpWs" name="objectClass" datatype="char" arraysize="3" ucd="src.class" value="TBD">
+        <DESCRIPTION>Target or object class</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1CJrcE00bxzwh5x2" name="spectralClass" datatype="char" arraysize="3" ucd="src.spType" value="TBD">
+        <DESCRIPTION>Object spectral class</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1H6gBwZiDI8Xwnbb" name="redshift" datatype="double" ucd="src.redshift" value="NaN">
+        <DESCRIPTION>Target redshift</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1JakggUBNfow3eQQ" name="varAmpl" datatype="double" value="NaN">
+        <DESCRIPTION>Target variability amplitude - typical</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_LdxzKNzOz1uHnhAz" name="name" datatype="char" arraysize="2" value="#1"/>
+      <PARAM ID="_LesqzfVMOKQ3sJxf" name="length" datatype="long" value="50"/>
+      <PARAM ID="_Lj2OYmlKYrOmQPYj" name="name" datatype="char" arraysize="2" value="#2"/>
+      <PARAM ID="_LlXCBJeUaO4nydSp" name="length" datatype="long" value="100"/>
+      <PARAM ID="_010174BLUAVSMDVw" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <PARAM ID="_010174BLUAVSMDVw" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <PARAM ID="_F0tnCu4Jhe6TDSxx" name="M" datatype="long" value="3">
+        <DESCRIPTION>MxN Matrix size - M</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_F0tnCu4Jhe6TDSxy" name="N" datatype="long" value="3">
+        <DESCRIPTION>MxN Matrix size - N</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_FloO5XpCpdpUOIgw" name="m" datatype="long" value="0"/>
+      <PARAM ID="_Fp7ER1qgvfCLjUUP" name="n" datatype="long" value="0"/>
+      <PARAM ID="_FqpkK3H6Kn6d1Z2Y" name="value" datatype="double" value="100.0"/>
+      <PARAM ID="_FsMLg6XzuyypOIfH" name="m" datatype="long" value="0"/>
+      <PARAM ID="_Fy2g4MYUgvRH3xzm" name="n" datatype="long" value="1"/>
+      <PARAM ID="_FyxRPdyStXOsU4r1" name="value" datatype="double" value="0.0"/>
+      <PARAM ID="_G5W2cK3j7if3b8V2" name="m" datatype="long" value="0"/>
+      <PARAM ID="_G7WNkyY9QmQIKBw2" name="n" datatype="long" value="2"/>
+      <PARAM ID="_GDiouLisSEJYAqb0" name="value" datatype="double" value="0.0"/>
+      <PARAM ID="_GGKP5LkbUuQkM12V" name="m" datatype="long" value="1"/>
+      <PARAM ID="_GKJ0Y2OEe3Wy9AJD" name="n" datatype="long" value="0"/>
+      <PARAM ID="_GLAyd5qIvQAqRVRC" name="value" datatype="double" value="-0.0"/>
+      <PARAM ID="_GSHsEyQJOPDZMEKQ" name="m" datatype="long" value="1"/>
+      <PARAM ID="_GULPvc7i2t1st2kp" name="n" datatype="long" value="1"/>
+      <PARAM ID="_GVOLhYwZhCFscPq3" name="value" datatype="double" value="100.0"/>
+      <PARAM ID="_GZyLtKEf2IMcO7xF" name="m" datatype="long" value="1"/>
+      <PARAM ID="_GaowwGKYjnuWyGZQ" name="n" datatype="long" value="2"/>
+      <PARAM ID="_Ge6cdqVJ4z8hocpi" name="value" datatype="double" value="0.0"/>
+      <PARAM ID="_GmJDTZFyigwgHF3x" name="m" datatype="long" value="2"/>
+      <PARAM ID="_Gp1V3caUBg0HDNCQ" name="n" datatype="long" value="0"/>
+      <PARAM ID="_GsEM0S0SF95JdN6i" name="value" datatype="double" value="29950.0"/>
+      <PARAM ID="_Gtixm4wdUQLWho6k" name="m" datatype="long" value="2"/>
+      <PARAM ID="_GuIEkvZ1xjRnl3CV" name="n" datatype="long" value="1"/>
+      <PARAM ID="_GuRyWQ5lr2wlxUkx" name="value" datatype="double" value="29950.0"/>
+      <PARAM ID="_H7UsxPJCn7MYdF3C" name="m" datatype="long" value="2"/>
+      <PARAM ID="_HDu087mE9OwLmyyh" name="n" datatype="long" value="2"/>
+      <PARAM ID="_HHHhNqc55VYb1dYx" name="value" datatype="double" value="1.0"/>
+      <PARAM ID="_M2GlcXZVSiJplxAz" name="algorithm" datatype="char" arraysize="3" value="TAN">
+        <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_M3wPLdgNb6AmcarD" name="nativeRefValue" datatype="double" value="32768.5">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_M3wtrSyf9qMAAFIk" name="targetRefValue" datatype="double" value="187.280152947">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_M40aE6wVGaNtSojR" name="scale" datatype="double" value="-3.66111111111e-05">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_M4u9k8u8Jo3wSffi" name="nativeRefValue" datatype="double" value="32768.5">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_M53niMh2XAO0IBg3" name="targetRefValue" datatype="double" value="2.05700100372">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_M5SOA0YK3fVcaZen" name="scale" datatype="double" value="3.66111111111e-05">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
       <!-- Data FIELDs -->
       <FIELD ID="_image-EVENTS_IMAGE" name="EVENTS_IMAGE" datatype="int"/>
       <DATA>

Modified: trunk/projects/dm/CubeDM-1.0/examples/chandra_events.vot
==============================================================================
--- trunk/projects/dm/CubeDM-1.0/examples/chandra_events.vot	Sat Apr 29 00:29:07 2017	(r3993)
+++ trunk/projects/dm/CubeDM-1.0/examples/chandra_events.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -20,11 +20,8 @@
       <GROUP ID="_0117pYWsEJmSbhJP" name="TimeFrame">
         <DESCRIPTION>TIME - Physical temporal domain frame</DESCRIPTION>
         <PARAM name="timescale" datatype="char" arraysize="2" value="TT"/>
-        <GROUP name="refPosition">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <GROUP name="offset">
-          <PARAM name="loc" datatype="double" value="50814.0"/>
+          <PARAM name="value" datatype="double" value="50814.0"/>
         </GROUP>
         <GROUP name="TimeFrame_CoordSpace">
           <DESCRIPTION>Time coordinate space</DESCRIPTION>
@@ -38,9 +35,6 @@
       </GROUP>
       <GROUP ID="_01290NTXcYmRii44" name="PHAFrame">
         <DESCRIPTION>PHA - Physical spectral domain frame</DESCRIPTION>
-        <GROUP name="refPosition">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <GROUP name="PHAFrame_CoordSpace">
           <DESCRIPTION>PHA coordinate space</DESCRIPTION>
           <GROUP ID="_0129ge70cAi4MErU" name="PHA_CoordAxis">
@@ -53,9 +47,6 @@
       </GROUP>
       <GROUP ID="_01390NTXcYmRii44" name="PIFrame">
         <DESCRIPTION>PI - Physical spectral domain frame</DESCRIPTION>
-        <GROUP name="refPosition">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <GROUP name="PIFrame_CoordSpace">
           <DESCRIPTION>PI coordinate space</DESCRIPTION>
           <GROUP ID="_0139ge70cAi4MErU" name="PI_CoordAxis">
@@ -68,9 +59,6 @@
       </GROUP>
       <GROUP ID="_01490NTXcYmRii44" name="EnergyFrame">
         <DESCRIPTION>Energy - Physical spectral domain frame</DESCRIPTION>
-        <GROUP name="refPosition">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <GROUP name="EnergyFrame_CoordSpace">
           <DESCRIPTION>Energy coordinate space</DESCRIPTION>
           <GROUP ID="_0149ge70cAi4MErU" name="Energy_CoordAxis">
@@ -83,9 +71,6 @@
       </GROUP>
       <GROUP ID="_010212XxjJ6d2Yfk" name="ChipFrame">
         <DESCRIPTION>CHIP - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
         <GROUP name="ChipFrame_CoordSpace">
           <DESCRIPTION>CHIP coordinate space (Cartesian)</DESCRIPTION>
@@ -109,11 +94,8 @@
           </GROUP>
         </GROUP>
       </GROUP>
-      <GROUP ID="_010312XxjJ6d2Yfk" name="TDETFrame">
+      <GROUP name="TDETFrame">
         <DESCRIPTION>TDET - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
         <GROUP name="TDETFrame_CoordSpace">
           <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
@@ -136,11 +118,8 @@
           </GROUP>
         </GROUP>
       </GROUP>
-      <GROUP ID="_010412XxjJ6d2Yfk" name="DETFrame">
+      <GROUP name="DETFrame">
         <DESCRIPTION>DET - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
         <GROUP name="DETFrame_CoordSpace">
           <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
@@ -165,9 +144,6 @@
       </GROUP>
       <GROUP ID="_010512XxjJ6d2Yfk" name="SkyFrame">
         <DESCRIPTION>SKY - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
         <GROUP name="SkyFrame_CoordSpace">
           <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
@@ -192,9 +168,6 @@
       </GROUP>
       <GROUP ID="_01016p6qFkb1I2p7" name="ICRSFrame">
         <DESCRIPTION>EQPOS - World spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <PARAM name="orientation" datatype="char" arraysize="4" value="ICRS"/>
         <GROUP name="equinox">
           <PARAM name="type" datatype="char" arraysize="1" value="J"/>
@@ -223,12 +196,14 @@
       </GROUP>
       <GROUP ID="_HPykZjnKKegGJhyB" name="TargetPosition">
         <GROUP name="coord">
-          <PARAM name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_Theta-Axis"/>
-        </GROUP>
-        <GROUP name="coord">
-          <PARAM name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_Phi-Axis"/>
+          <GROUP name="ra">
+            <PARAM name="loc" datatype="double" value="NaN"/>
+            <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_Theta-Axis"/>
+          </GROUP>
+          <GROUP name="dec">
+            <PARAM name="loc" datatype="double" value="NaN"/>
+            <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_Phi-Axis"/>
+          </GROUP>
         </GROUP>
       </GROUP>
       <GROUP name="SparseCubeDataset">
@@ -242,9 +217,6 @@
         <PARAM name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
           <DESCRIPTION>Calibration level</DESCRIPTION>
         </PARAM>
-        <GROUP name="Characterisation">
-          <DESCRIPTION>Characteristics of data coordinate space</DESCRIPTION>
-        </GROUP>
         <GROUP name="Curation">
           <DESCRIPTION>Dataset curation metadata</DESCRIPTION>
           <PARAM name="publisherDID" datatype="char" arraysize="20" ucd="meta.ref.url;meta.curation" value="ADS/Sa.CXO#obs/01838">
@@ -386,34 +358,31 @@
             <DESCRIPTION>Target location (eg: RA, DEC)</DESCRIPTION>
           </GROUP>
         </GROUP>
-        <GROUP ref="_L2LRrN4p4HIKaeCj" name="REF_CoordSys-Chip">
-          <DESCRIPTION>Global coordinate systems (Chip)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_6hrehomO3bIilaTo" name="REF_CoordSys-Phys">
-          <DESCRIPTION>Global coordinate systems (Physical)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A18RNKjFBdI7kMap" name="REF_CoordSys-World">
-          <DESCRIPTION>Global coordinate systems (World)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A9OKA8Pw7UvuTGbF" name="REF_SparseCube">
-          <DESCRIPTION>Sparse Cube point data</DESCRIPTION>
-        </GROUP>
       </GROUP>
-      <GROUP ID="_A9OKA8Pw7UvuTGbF" name="SparseCube">
-        <GROUP ID="_L2LRrN4p4HIKaeCj" name="CoordSys-Chip">
+      <GROUP name="SparseCube">
+        <GROUP name="CoordSys-Chip">
           <DESCRIPTION>Chip Coordinate System</DESCRIPTION>
+          <GROUP name="refPosition">
+            <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+          </GROUP>
           <GROUP ref="_0117pYWsEJmSbhJP" name="REF_TimeFrame"/>
           <GROUP ref="_010212XxjJ6d2Yfk" name="REF_ChipFrame"/>
           <GROUP ref="_01290NTXcYmRii44" name="REF_PHAFrame"/>
         </GROUP>
-        <GROUP ID="_6hrehomO3bIilaTo" name="CoordSys-Phys">
+        <GROUP name="CoordSys-Phys">
           <DESCRIPTION>Physical Coordinate System</DESCRIPTION>
+          <GROUP name="refPosition">
+            <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+          </GROUP>
           <GROUP ref="_0117pYWsEJmSbhJP" name="REF_TimeFrame"/>
           <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame"/>
           <GROUP ref="_01390NTXcYmRii44" name="REF_PIFrame"/>
         </GROUP>
-        <GROUP ID="_A18RNKjFBdI7kMap" name="CoordSys-World">
+        <GROUP name="CoordSys-World">
           <DESCRIPTION>World Coordinate System</DESCRIPTION>
+          <GROUP name="refPosition">
+            <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+          </GROUP>
           <GROUP ref="_0117pYWsEJmSbhJP" name="REF_TimeFrame"/>
           <GROUP ref="_01016p6qFkb1I2p7" name="REF_ICRSFrame"/>
           <GROUP ref="_01490NTXcYmRii44" name="REF_EnergyFrame"/>
@@ -474,16 +443,18 @@
             <DESCRIPTION>Spatial Domain data axis - Sky</DESCRIPTION>
             <GROUP name="ChipData">
               <GROUP name="coord">
-                <FIELDref ref="_col-chipx"/>
-                <GROUP ref="_0102Kby9hIzCYJPJ" name="REF_Chip_X-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-chipy"/>
-                <GROUP ref="_0102W9piipgxj8Lq" name="REF_Chip_Y-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-ccd_id"/>
-                <GROUP ref="_0102cwvI7yS93aIu" name="REF_Chip_Z-Axis"/>
+                <GROUP name="x">
+                  <FIELDref ref="_col-chipx"/>
+                  <GROUP ref="_0102Kby9hIzCYJPJ" name="REF_Chip_X-Axis"/>
+                </GROUP>
+                <GROUP name="y">
+                  <FIELDref ref="_col-chipy"/>
+                  <GROUP ref="_0102W9piipgxj8Lq" name="REF_Chip_Y-Axis"/>
+                </GROUP>
+                <GROUP name="z">
+                  <FIELDref ref="_col-ccd_id"/>
+                  <GROUP ref="_0102cwvI7yS93aIu" name="REF_Chip_Z-Axis"/>
+                </GROUP>
               </GROUP>
             </GROUP>
           </GROUP>
@@ -491,12 +462,14 @@
             <DESCRIPTION>Spatial Domain data axis - Sky</DESCRIPTION>
             <GROUP name="SKYData">
               <GROUP name="coord">
-                <FIELDref ref="_col-x"/>
-                <GROUP ref="_0105Kby9hIzCYJPJ" name="REF_Sky_X-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-y"/>
-                <GROUP ref="_0105W9piipgxj8Lq" name="REF_Sky_Y-Axis"/>
+                <GROUP name="x">
+                  <FIELDref ref="_col-x"/>
+                  <GROUP ref="_0105Kby9hIzCYJPJ" name="REF_Sky_X-Axis"/>
+                </GROUP>
+                <GROUP name="y">
+                  <FIELDref ref="_col-y"/>
+                  <GROUP ref="_0105W9piipgxj8Lq" name="REF_Sky_Y-Axis"/>
+                </GROUP>
               </GROUP>
             </GROUP>
           </GROUP>
@@ -504,12 +477,14 @@
             <DESCRIPTION>Spatial Domain data axis - EQPOS</DESCRIPTION>
             <GROUP name="EQPOSData">
               <GROUP name="coord">
-                <FIELDref ref="_col-ra"/>
-                <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_Theta-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-dec"/>
-                <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_Phi-Axis"/>
+                <GROUP name="ra">
+                  <FIELDref ref="_col-ra"/>
+                  <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_Theta-Axis"/>
+                </GROUP>
+                <GROUP name="dec">
+                  <FIELDref ref="_col-dec"/>
+                  <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_Phi-Axis"/>
+                </GROUP>
               </GROUP>
             </GROUP>
           </GROUP>
@@ -543,17 +518,17 @@
         </GROUP>
       </GROUP>
       <!-- Data FIELDs -->
-      <FIELD ID="_col-time" name="time" datatype="double"/>
-      <FIELD ID="_col-chipx" name="chipx" datatype="double"/>
-      <FIELD ID="_col-chipy" name="chipy" datatype="double"/>
-      <FIELD ID="_col-ccd_id" name="ccd_id" datatype="double"/>
-      <FIELD ID="_col-x" name="x" datatype="double"/>
-      <FIELD ID="_col-y" name="y" datatype="double"/>
-      <FIELD ID="_col-ra" name="ra" datatype="double"/>
-      <FIELD ID="_col-dec" name="dec" datatype="double"/>
-      <FIELD ID="_col-pha" name="pha" datatype="double"/>
-      <FIELD ID="_col-pi" name="pi" datatype="double"/>
-      <FIELD ID="_col-energy" name="energy" datatype="double"/>
+      <FIELD ID="_col-time" name="time" datatype="double" unit="s"/>
+      <FIELD ID="_col-chipx" name="chipx" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-chipy" name="chipy" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-ccd_id" name="ccd_id" datatype="int"/>
+      <FIELD ID="_col-x" name="x" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-y" name="y" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-ra" name="ra" datatype="double" unit="deg"/>
+      <FIELD ID="_col-dec" name="dec" datatype="double" unit="deg"/>
+      <FIELD ID="_col-pha" name="pha" datatype="double" unit="adu"/>
+      <FIELD ID="_col-pi" name="pi" datatype="double" unit="chan"/>
+      <FIELD ID="_col-energy" name="energy" datatype="double" unit="eV"/>
       <DATA>
         <FITS extnum="1">
           <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/chandra_events.fits"/>

Modified: trunk/projects/dm/CubeDM-1.0/examples/chandra_events_annotated.vot
==============================================================================
--- trunk/projects/dm/CubeDM-1.0/examples/chandra_events_annotated.vot	Sat Apr 29 00:29:07 2017	(r3993)
+++ trunk/projects/dm/CubeDM-1.0/examples/chandra_events_annotated.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -6,10 +6,6 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
-      <NAME>coordsys</NAME>
-      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml</URL>
-    </MODEL>
-    <MODEL>
       <NAME>cube</NAME>
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml</URL>
     </MODEL>
@@ -22,11 +18,15 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
       <NAME>trans</NAME>
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/trans/STCTrans-2.0.vo-dml.xml</URL>
     </MODEL>
     <GLOBALS>
-      <INSTANCE ID="_001J6U7FbgCwoWQF2" dmtype="ds:party.Organization">
+      <INSTANCE ID="_001J6U7FbgCwoWQF" dmtype="ds:party.Organization">
         <ATTRIBUTE dmrole="ds:party.Party.name">
           <LITERAL dmtype="ivoa:string" value="The Chandra X-Ray Center"/>
         </ATTRIBUTE>
@@ -43,7 +43,7 @@
           <LITERAL dmtype="ivoa:anyURI" value="http://chandra.si.edu/graphics/top/icon_cxc_foot.jpg"/>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE ID="_002J6U7FbgCwoWQF2" dmtype="ds:party.Individual">
+      <INSTANCE ID="_002J6U7FbgCwoWQF" dmtype="ds:party.Individual">
         <ATTRIBUTE dmrole="ds:party.Party.name">
           <LITERAL dmtype="ivoa:string" value="CXC HelpDesk System"/>
         </ATTRIBUTE>
@@ -57,35 +57,28 @@
           <LITERAL dmtype="ivoa:string" value="N/A"/>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE ID="_0117pYWsEJmSbhJP2" dmtype="coordsys:domain.temporal.TimeFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeFrame.timescale">
-          <LITERAL dmtype="coordsys:domain.temporal.TimeScale" value="TT"/>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeFrame.refPosition">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeFrame.offset">
-          <INSTANCE dmtype="coordsys:domain.temporal.TimeOffset">
-            <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeOffset.loc">
+      <INSTANCE ID="_0117pYWsEJmSbhJP" dmtype="coords:domain.temporal.TimeFrame">
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.timescale">
+          <LITERAL dmtype="coords:domain.temporal.TimeScale" value="TT"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.time0">
+          <INSTANCE dmtype="coords:domain.temporal.TimeOffset">
+            <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
               <LITERAL dmtype="ivoa:RealQuantity" value="50814.0"/>
             </ATTRIBUTE>
           </INSTANCE>
         </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.temporal.TimeFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.temporal.CoordSpace1D">
-            <COMPOSITION dmrole="coordsys:domain.temporal.CoordSpace.axis"> 
-              <INSTANCE ID="_0118WLLnSEBj0p462" dmtype="coordsys:domain.temporal.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.temporal.CoordAxis.name">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.temporal.TimeSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0118WLLnSEBj0p46" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="time"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.temporal.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" value="-Inf"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.temporal.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -93,25 +86,18 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_01290NTXcYmRii442" dmtype="coordsys:domain.spectral.SpectralFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralFrame.refPosition">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spectral.SpectralFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spectral.CoordSpace1D">
-            <COMPOSITION dmrole="coordsys:domain.spectral.CoordSpace.axis"> 
-              <INSTANCE ID="_0129ge70cAi4MErU2" dmtype="coordsys:domain.spectral.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.name">
+      <INSTANCE ID="_01290NTXcYmRii44" dmtype="coords:domain.spectral.SpectralFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spectral.SpectralSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0129ge70cAi4MErU" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="pha"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="adu" value="0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="adu" value="36855"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -119,25 +105,18 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_01390NTXcYmRii442" dmtype="coordsys:domain.spectral.SpectralFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralFrame.refPosition">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spectral.SpectralFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spectral.CoordSpace1D">
-            <COMPOSITION dmrole="coordsys:domain.spectral.CoordSpace.axis"> 
-              <INSTANCE ID="_0139ge70cAi4MErU2" dmtype="coordsys:domain.spectral.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.name">
+      <INSTANCE ID="_01390NTXcYmRii44" dmtype="coords:domain.spectral.SpectralFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:CoordSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0139ge70cAi4MErU" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="pi"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="chan" value="1"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="chan" value="1024"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -145,25 +124,18 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_01490NTXcYmRii442" dmtype="coordsys:domain.spectral.SpectralFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralFrame.refPosition">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spectral.SpectralFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spectral.CoordSpace1D">
-            <COMPOSITION dmrole="coordsys:domain.spectral.CoordSpace.axis"> 
-              <INSTANCE ID="_0149ge70cAi4MErU2" dmtype="coordsys:domain.spectral.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.name">
+      <INSTANCE ID="_01490NTXcYmRii44" dmtype="coords:domain.spectral.SpectralFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:CoordSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0149ge70cAi4MErU" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="energy"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="eV" value="0.0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="eV" value="1e+06"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -171,50 +143,43 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010212XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <LITERAL dmtype="coordsys:domain.spatial.StdRefFrame" value="CUSTOM"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE ID="_0102Kby9hIzCYJPJ2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE ID="_010212XxjJ6d2Yfk" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="CUSTOM"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0102Kby9hIzCYJPJ" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="chipx"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="1"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="1024"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_0102W9piipgxj8Lq2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_0102W9piipgxj8Lq" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="chipy"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="1"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="1024"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_0102cwvI7yS93aIu2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_0102cwvI7yS93aIu" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="ccd_id"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:IntegerQuantity" value="0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:IntegerQuantity" value="9"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -222,47 +187,40 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010312XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <LITERAL dmtype="coordsys:domain.spatial.StdRefFrame" value="CUSTOM"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="CUSTOM"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="tdetx"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="1"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="8192"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="tdety"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="1"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="8192"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" value="0.0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -270,47 +228,40 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010412XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <LITERAL dmtype="coordsys:domain.spatial.StdRefFrame" value="CUSTOM"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="CUSTOM"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="detx"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="0.5"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="8192.5"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="dety"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="0.5"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="8192.5"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" value="0.0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -318,47 +269,40 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010512XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <LITERAL dmtype="coordsys:domain.spatial.StdRefFrame" value="CUSTOM"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE ID="_0105Kby9hIzCYJPJ2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE ID="_010512XxjJ6d2Yfk" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="CUSTOM"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0105Kby9hIzCYJPJ" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="x"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="0.5"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="8192.5"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_0105W9piipgxj8Lq2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_0105W9piipgxj8Lq" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="y"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="0.5"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="8192.5"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" value="0.0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -366,57 +310,50 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_01016p6qFkb1I2p72" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <LITERAL dmtype="coordsys:domain.spatial.StdRefFrame" value="ICRS"/>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.equinox">
-          <INSTANCE dmtype="coordsys:domain.spatial.Epoch">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.Epoch.type">
-              <LITERAL dmtype="coordsys:domain.spatial.EpochType" value="J"/>
+      <INSTANCE ID="_01016p6qFkb1I2p7" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="ICRS"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.equinox">
+          <INSTANCE dmtype="coords:domain.spatial.Epoch">
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.type">
+              <LITERAL dmtype="coords:domain.spatial.EpochType" value="J"/>
             </ATTRIBUTE>
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.Epoch.year">
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.year">
               <LITERAL dmtype="ivoa:real" value="2000.0"/>
             </ATTRIBUTE>
           </INSTANCE>
         </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Spherical">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Spherical">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" value="0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_01017W9piipgxj8L2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_01017W9piipgxj8L" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="ra"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="0.0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="360.0"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_01017cwvI7yS93aI2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_01017cwvI7yS93aI" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="dec"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="-90.0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="+90.0"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -424,27 +361,31 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_HPykZjnKKegGJhyB2" dmtype="coords:domain.spatial.Position2D">
-        <ATTRIBUTE dmrole="coords:domain.spatial.Position2D.coord">
-          <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-              <LITERAL dmtype="ivoa:RealQuantity" value="NaN"/>
-            </ATTRIBUTE>
-            <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-              <IDREF>_01017W9piipgxj8L2</IDREF>
-            </REFERENCE>
-          </INSTANCE>
-          <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-              <LITERAL dmtype="ivoa:RealQuantity" value="NaN"/>
+      <INSTANCE ID="_HPykZjnKKegGJhyB" dmtype="meas:Position2D">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+            <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="NaN"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_01017W9piipgxj8L</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="NaN"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_01017cwvI7yS93aI</IDREF>
+                </REFERENCE>
+              </INSTANCE>
             </ATTRIBUTE>
-            <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-              <IDREF>_01017cwvI7yS93aI2</IDREF>
-            </REFERENCE>
           </INSTANCE>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE dmtype="cube:SparseCubeDataset">
+      <INSTANCE dmtype="ds:experiment.ObsDataset">
         <ATTRIBUTE dmrole="ds:dataset.Dataset.dataProductType">
           <LITERAL dmtype="ds:dataset.DataProductType" value="EVENT"/>
         </ATTRIBUTE>
@@ -454,10 +395,6 @@
         <ATTRIBUTE dmrole="ds:experiment.ObsDataset.calibLevel">
           <LITERAL dmtype="ivoa:integer" value="3"/>
         </ATTRIBUTE>
-        <COMPOSITION dmrole="ds:experiment.ObsDataset.characterisation"> 
-          <INSTANCE dmtype="ds:experiment.Characterisation">
-          </INSTANCE>
-        </COMPOSITION> 
         <COMPOSITION dmrole="ds:dataset.Dataset.curation"> 
           <INSTANCE dmtype="ds:dataset.Curation">
             <ATTRIBUTE dmrole="ds:dataset.Curation.publisherDID">
@@ -475,7 +412,7 @@
             <COMPOSITION dmrole="ds:dataset.Curation.contact"> 
               <INSTANCE dmtype="ds:dataset.Contact">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_002J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_002J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -485,7 +422,7 @@
                   <LITERAL dmtype="ivoa:anyURI" value="TBD"/>
                 </ATTRIBUTE>
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -531,14 +468,14 @@
                   <LITERAL dmtype="ivoa:string" value="CIAO: Chandra's data analysis system (ADS, PS); Fruscione et al. 2006, SPIE Proc. 6270, 62701V, D.R. Silvia and R.E. Doxsey, eds."/>
                 </ATTRIBUTE>
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
             <COMPOSITION dmrole="ds:dataset.DataID.creator"> 
               <INSTANCE dmtype="ds:dataset.Creator">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -569,7 +506,7 @@
             <COMPOSITION dmrole="ds:experiment.ObsConfig.facility"> 
               <INSTANCE dmtype="ds:experiment.Facility">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -610,52 +547,65 @@
               <LITERAL dmtype="ivoa:real" value="NaN"/>
             </ATTRIBUTE>
             <REFERENCE dmrole="ds:experiment.BaseTarget.position">
-              <IDREF>_HPykZjnKKegGJhyB2</IDREF>
+              <IDREF>_HPykZjnKKegGJhyB</IDREF>
             </REFERENCE>
           </INSTANCE>
         </COMPOSITION> 
-        <REFERENCE dmrole="ds:experiment.ObsDataset.coordSys">
-          <IDREF>_L2LRrN4p4HIKaeCj2</IDREF>
-          <IDREF>_6hrehomO3bIilaTo2</IDREF>
-          <IDREF>_A18RNKjFBdI7kMap2</IDREF>
-        </REFERENCE>
-        <REFERENCE dmrole="cube:SparseCubeDataset.cube">
-          <IDREF>_A9OKA8Pw7UvuTGbF2</IDREF>
-        </REFERENCE>
       </INSTANCE>
-      <INSTANCE ID="_A9OKA8Pw7UvuTGbF2" dmtype="cube:SparseCube">
+      <INSTANCE dmtype="cube:SparseCube">
         <COMPOSITION dmrole="cube:DataProduct.coordSys"> 
-          <INSTANCE ID="_L2LRrN4p4HIKaeCj2" dmtype="cube:CoordSys">
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.timeFrame">
-              <IDREF>_0117pYWsEJmSbhJP2</IDREF>
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <LITERAL dmtype="coords:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.timeFrame">
+              <IDREF>_0117pYWsEJmSbhJP</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spaceFrame">
-              <IDREF>_010212XxjJ6d2Yfk2</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_010212XxjJ6d2Yfk</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spectralFrame">
-              <IDREF>_01290NTXcYmRii442</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spectralFrame">
+              <IDREF>_01290NTXcYmRii44</IDREF>
             </REFERENCE>
           </INSTANCE>
-          <INSTANCE ID="_6hrehomO3bIilaTo2" dmtype="cube:CoordSys">
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.timeFrame">
-              <IDREF>_0117pYWsEJmSbhJP2</IDREF>
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <LITERAL dmtype="coords:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.timeFrame">
+              <IDREF>_0117pYWsEJmSbhJP</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spaceFrame">
-              <IDREF>_010512XxjJ6d2Yfk2</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_010512XxjJ6d2Yfk</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spectralFrame">
-              <IDREF>_01390NTXcYmRii442</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spectralFrame">
+              <IDREF>_01390NTXcYmRii44</IDREF>
             </REFERENCE>
           </INSTANCE>
-          <INSTANCE ID="_A18RNKjFBdI7kMap2" dmtype="cube:CoordSys">
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.timeFrame">
-              <IDREF>_0117pYWsEJmSbhJP2</IDREF>
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <LITERAL dmtype="coords:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.timeFrame">
+              <IDREF>_0117pYWsEJmSbhJP</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spaceFrame">
-              <IDREF>_01016p6qFkb1I2p72</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_01016p6qFkb1I2p7</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spectralFrame">
-              <IDREF>_01490NTXcYmRii442</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spectralFrame">
+              <IDREF>_01490NTXcYmRii44</IDREF>
             </REFERENCE>
           </INSTANCE>
         </COMPOSITION> 
@@ -695,10 +645,10 @@
                   </INSTANCE>
                 </COMPOSITION> 
                 <REFERENCE dmrole="trans:FrameTransform.nativeFrame">
-                  <IDREF>_010512XxjJ6d2Yfk2</IDREF>
+                  <IDREF>_010512XxjJ6d2Yfk</IDREF>
                 </REFERENCE>
                 <REFERENCE dmrole="trans:FrameTransform.targetFrame">
-                  <IDREF>_01016p6qFkb1I2p72</IDREF>
+                  <IDREF>_01016p6qFkb1I2p7</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -711,145 +661,178 @@
     </GLOBALS>
     <TEMPLATES tableref="_table1">
         <INSTANCE ID="_AK9CaKnrQwqiiyvn3" dmtype="cube:NDPoint">
-          <COMPOSITION dmrole="cube:NDPoint.axis"> 
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords:domain.temporal.Time">
-                  <ATTRIBUTE dmrole="coords:domain.temporal.Time.coord">
-                    <INSTANCE dmtype="coordsys:domain.temporal.TimeCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeOffset.loc">
+          <COMPOSITION dmrole="cube:DataElement.axis"> 
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:TimeMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.temporal.TimeOffset">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
                         <COLUMN ref="_col-time" dmtype="ivoa:RealQuantity"/>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.temporal.TimeCoord.axis">
-                        <IDREF>_0118WLLnSEBj0p462</IDREF>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0118WLLnSEBj0p46</IDREF>
                       </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords:domain.spatial.Position3D">
-                  <ATTRIBUTE dmrole="coords:domain.spatial.Position3D.coord">
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-chipx" dmtype="ivoa:RealQuantity"/>
-                      </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_0102Kby9hIzCYJPJ2</IDREF>
-                      </REFERENCE>
-                    </INSTANCE>
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-chipy" dmtype="ivoa:RealQuantity"/>
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:Position3D">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spatial.SpatialCoord3D">
+                      <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-chipx" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_0102Kby9hIzCYJPJ</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-chipy" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_0102W9piipgxj8Lq</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-ccd_id" dmtype="ivoa:IntegerQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_0102cwvI7yS93aIu</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_0102W9piipgxj8Lq2</IDREF>
-                      </REFERENCE>
-                    </INSTANCE>
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-ccd_id" dmtype="ivoa:RealQuantity"/>
-                      </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_0102cwvI7yS93aIu2</IDREF>
-                      </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords.domain.spatial.Position2D">
-                  <ATTRIBUTE dmrole="coords:domain.spatial.Position2D.coord">
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-x" dmtype="ivoa:RealQuantity"/>
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:Position2D">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+                      <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-x" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_0105Kby9hIzCYJPJ</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-y" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_0105W9piipgxj8Lq</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_0105Kby9hIzCYJPJ2</IDREF>
-                      </REFERENCE>
-                    </INSTANCE>
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-y" dmtype="ivoa:RealQuantity"/>
-                      </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_0105W9piipgxj8Lq2</IDREF>
-                      </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords.domain.spatial.Position2D">
-                  <ATTRIBUTE dmrole="coords:domain.spatial.Position2D.coord">
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-ra" dmtype="ivoa:RealQuantity"/>
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:Position2D">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+                      <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-ra" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_01017W9piipgxj8L</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-dec" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_01017cwvI7yS93aI</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_01017W9piipgxj8L2</IDREF>
-                      </REFERENCE>
-                    </INSTANCE>
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-dec" dmtype="ivoa:RealQuantity"/>
-                      </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_01017cwvI7yS93aI2</IDREF>
-                      </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords:domain.spectral.Energy">
-                  <ATTRIBUTE dmrole="coords:domain.spectral.DerivedSpectralCoordinate.coord">
-                    <INSTANCE dmtype="coordsys:domain.spectral.SpectralCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralCoord.loc">
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:SpectralCoordMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spectral.SpectralValue">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
                         <COLUMN ref="_col-pha" dmtype="ivoa:RealQuantity"/>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spectral.SpectralCoord.axis">
-                        <IDREF>_0129ge70cAi4MErU2</IDREF>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0129ge70cAi4MErU</IDREF>
                       </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords:domain.spectral.Energy">
-                  <ATTRIBUTE dmrole="coords:domain.spectral.DerivedSpectralCoordinate.coord">
-                    <INSTANCE dmtype="coordsys:domain.spectral.SpectralCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralCoord.loc">
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:SpectralCoordMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spectral.SpectralValue">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
                         <COLUMN ref="_col-pi" dmtype="ivoa:RealQuantity"/>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spectral.SpectralCoord.axis">
-                        <IDREF>_0139ge70cAi4MErU2</IDREF>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0139ge70cAi4MErU</IDREF>
                       </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords:domain.spectral.Energy">
-                  <ATTRIBUTE dmrole="coords:domain.spectral.DerivedSpectralCoordinate.coord">
-                    <INSTANCE dmtype="coordsys:domain.spectral.SpectralCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralCoord.loc">
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:SpectralCoordMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spectral.SpectralValue">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
                         <COLUMN ref="_col-energy" dmtype="ivoa:RealQuantity"/>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spectral.SpectralCoord.axis">
-                        <IDREF>_0149ge70cAi4MErU2</IDREF>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0149ge70cAi4MErU</IDREF>
                       </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
@@ -862,558 +845,203 @@
   </VODML>
   <RESOURCE>
     <TABLE ID="_table1">
-      <GROUP ID="_001J6U7FbgCwoWQF" name="SAO">
-        <DESCRIPTION>Smithsonian Astrophysical Observatory</DESCRIPTION>
-        <PARAM name="name" datatype="char" arraysize="24" value="The Chandra X-Ray Center"/>
-        <PARAM name="address" datatype="char" arraysize="41" value="60 Garden Street, Cambridge, MA 02138 USA"/>
-        <PARAM name="email" datatype="char" arraysize="27" ucd="meta.ref.url;meta.email" value="cxcweb at head.cfa.harvard.edu"/>
-        <PARAM name="phone" datatype="char" arraysize="12" value="617-496-7941"/>
-        <PARAM name="logo" datatype="char" arraysize="52" ucd="meta.ref.url" value="http://chandra.si.edu/graphics/top/icon_cxc_foot.jpg"/>
-      </GROUP>
-      <GROUP ID="_002J6U7FbgCwoWQF" name="CXCHelpdesk">
-        <DESCRIPTION>Contact Individual</DESCRIPTION>
-        <PARAM name="name" datatype="char" arraysize="19" value="CXC HelpDesk System"/>
-        <PARAM name="address" datatype="char" arraysize="3" value="N/A"/>
-        <PARAM name="email" datatype="char" arraysize="28" ucd="meta.ref.url;meta.email" value="cxchelp at head.cfa.harvard.edu"/>
-        <PARAM name="phone" datatype="char" arraysize="3" value="N/A"/>
-      </GROUP>
-      <GROUP ID="_0117pYWsEJmSbhJP" name="TimeFrame">
-        <DESCRIPTION>TIME - Physical temporal domain frame</DESCRIPTION>
-        <PARAM name="timescale" datatype="char" arraysize="2" value="TT"/>
-        <GROUP name="refPosition">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <GROUP name="offset">
-          <PARAM name="loc" datatype="double" value="50814.0"/>
-        </GROUP>
-        <GROUP name="TimeFrame_CoordSpace">
-          <DESCRIPTION>Time coordinate space</DESCRIPTION>
-          <GROUP ID="_0118WLLnSEBj0p46" name="Time_CoordAxis">
-            <DESCRIPTION>time axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="4" value="time"/>
-            <PARAM name="domainMin" datatype="double" value="-Inf"/>
-            <PARAM name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_01290NTXcYmRii44" name="PHAFrame">
-        <DESCRIPTION>PHA - Physical spectral domain frame</DESCRIPTION>
-        <GROUP name="refPosition">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <GROUP name="PHAFrame_CoordSpace">
-          <DESCRIPTION>PHA coordinate space</DESCRIPTION>
-          <GROUP ID="_0129ge70cAi4MErU" name="PHA_CoordAxis">
-            <DESCRIPTION>pha axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="3" value="pha"/>
-            <PARAM name="domainMin" datatype="double" value="0" unit="adu"/>
-            <PARAM name="domainMax" datatype="double" value="36855" unit="adu"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_01390NTXcYmRii44" name="PIFrame">
-        <DESCRIPTION>PI - Physical spectral domain frame</DESCRIPTION>
-        <GROUP name="refPosition">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <GROUP name="PIFrame_CoordSpace">
-          <DESCRIPTION>PI coordinate space</DESCRIPTION>
-          <GROUP ID="_0139ge70cAi4MErU" name="PI_CoordAxis">
-            <DESCRIPTION>pi axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="2" value="pi"/>
-            <PARAM name="domainMin" datatype="double" value="1" unit="chan"/>
-            <PARAM name="domainMax" datatype="double" value="1024" unit="chan"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_01490NTXcYmRii44" name="EnergyFrame">
-        <DESCRIPTION>Energy - Physical spectral domain frame</DESCRIPTION>
-        <GROUP name="refPosition">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <GROUP name="EnergyFrame_CoordSpace">
-          <DESCRIPTION>Energy coordinate space</DESCRIPTION>
-          <GROUP ID="_0149ge70cAi4MErU" name="Energy_CoordAxis">
-            <DESCRIPTION>energy axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="6" value="energy"/>
-            <PARAM name="domainMin" datatype="double" value="0.0" unit="eV"/>
-            <PARAM name="domainMax" datatype="double" value="1e+06" unit="eV"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010212XxjJ6d2Yfk" name="ChipFrame">
-        <DESCRIPTION>CHIP - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="ChipFrame_CoordSpace">
-          <DESCRIPTION>CHIP coordinate space (Cartesian)</DESCRIPTION>
-          <GROUP ID="_0102Kby9hIzCYJPJ" name="Chip_X-Axis">
-            <DESCRIPTION>chipx axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="5" value="chipx"/>
-            <PARAM name="domainMin" datatype="double" value="1" unit="pixel"/>
-            <PARAM name="domainMax" datatype="double" value="1024" unit="pixel"/>
-          </GROUP>
-          <GROUP ID="_0102W9piipgxj8Lq" name="Chip_Y-Axis">
-            <DESCRIPTION>chipy axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="5" value="chipy"/>
-            <PARAM name="domainMin" datatype="double" value="1" unit="pixel"/>
-            <PARAM name="domainMax" datatype="double" value="1024" unit="pixel"/>
-          </GROUP>
-          <GROUP ID="_0102cwvI7yS93aIu" name="Chip_Z-Axis">
-            <DESCRIPTION>ccd_id axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="6" value="ccd_id"/>
-            <PARAM name="domainMin" datatype="int" value="0"/>
-            <PARAM name="domainMax" datatype="int" value="9"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010312XxjJ6d2Yfk" name="TDETFrame">
-        <DESCRIPTION>TDET - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="TDETFrame_CoordSpace">
-          <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
-          <GROUP name="TDET_X-Axis">
-            <DESCRIPTION>tdetx axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="5" value="tdetx"/>
-            <PARAM name="domainMin" datatype="double" value="1" unit="pixel"/>
-            <PARAM name="domainMax" datatype="double" value="8192" unit="pixel"/>
-          </GROUP>
-          <GROUP name="TDET_Y-Axis">
-            <DESCRIPTION>tdety axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="5" value="tdety"/>
-            <PARAM name="domainMin" datatype="double" value="1" unit="pixel"/>
-            <PARAM name="domainMax" datatype="double" value="8192" unit="pixel"/>
-          </GROUP>
-          <GROUP name="TDET_Z-Axis">
-            <DESCRIPTION>z axis</DESCRIPTION>
-            <PARAM name="domainMin" datatype="double" value="0.0"/>
-            <PARAM name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010412XxjJ6d2Yfk" name="DETFrame">
-        <DESCRIPTION>DET - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="DETFrame_CoordSpace">
-          <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
-          <GROUP name="DET_X-Axis">
-            <DESCRIPTION>detx axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="4" value="detx"/>
-            <PARAM name="domainMin" datatype="double" value="0.5" unit="pixel"/>
-            <PARAM name="domainMax" datatype="double" value="8192.5" unit="pixel"/>
-          </GROUP>
-          <GROUP name="DET_Y-Axis">
-            <DESCRIPTION>dety axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="4" value="dety"/>
-            <PARAM name="domainMin" datatype="double" value="0.5" unit="pixel"/>
-            <PARAM name="domainMax" datatype="double" value="8192.5" unit="pixel"/>
-          </GROUP>
-          <GROUP name="DET_Z-Axis">
-            <DESCRIPTION>z axis</DESCRIPTION>
-            <PARAM name="domainMin" datatype="double" value="0.0"/>
-            <PARAM name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010512XxjJ6d2Yfk" name="SkyFrame">
-        <DESCRIPTION>SKY - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="SkyFrame_CoordSpace">
-          <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
-          <GROUP ID="_0105Kby9hIzCYJPJ" name="Sky_X-Axis">
-            <DESCRIPTION>x axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="1" value="x"/>
-            <PARAM name="domainMin" datatype="double" value="0.5" unit="pixel"/>
-            <PARAM name="domainMax" datatype="double" value="8192.5" unit="pixel"/>
-          </GROUP>
-          <GROUP ID="_0105W9piipgxj8Lq" name="Sky_Y-Axis">
-            <DESCRIPTION>y axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="1" value="y"/>
-            <PARAM name="domainMin" datatype="double" value="0.5" unit="pixel"/>
-            <PARAM name="domainMax" datatype="double" value="8192.5" unit="pixel"/>
-          </GROUP>
-          <GROUP name="Sky_Z-Axis">
-            <DESCRIPTION>z axis</DESCRIPTION>
-            <PARAM name="domainMin" datatype="double" value="0.0"/>
-            <PARAM name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_01016p6qFkb1I2p7" name="ICRSFrame">
-        <DESCRIPTION>EQPOS - World spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM name="orientation" datatype="char" arraysize="4" value="ICRS"/>
-        <GROUP name="equinox">
-          <PARAM name="type" datatype="char" arraysize="1" value="J"/>
-          <PARAM name="year" datatype="double" value="2000.0"/>
-        </GROUP>
-        <GROUP name="ICRSFrame_CoordSpace">
-          <DESCRIPTION>Spherical coordinate space</DESCRIPTION>
-          <GROUP name="ICRS_R-Axis">
-            <DESCRIPTION>r axis</DESCRIPTION>
-            <PARAM name="domainMin" datatype="double" value="0"/>
-            <PARAM name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-          <GROUP ID="_01017W9piipgxj8L" name="ICRS_Theta-Axis">
-            <DESCRIPTION>ra axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="2" value="ra"/>
-            <PARAM name="domainMin" datatype="double" value="0.0" unit="deg"/>
-            <PARAM name="domainMax" datatype="double" value="360.0" unit="deg"/>
-          </GROUP>
-          <GROUP ID="_01017cwvI7yS93aI" name="ICRS_Phi-Axis">
-            <DESCRIPTION>dec axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="3" value="dec"/>
-            <PARAM name="domainMin" datatype="double" value="-90.0" unit="deg"/>
-            <PARAM name="domainMax" datatype="double" value="+90.0" unit="deg"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_HPykZjnKKegGJhyB" name="TargetPosition">
-        <GROUP name="coord">
-          <PARAM name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_Theta-Axis"/>
-        </GROUP>
-        <GROUP name="coord">
-          <PARAM name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_Phi-Axis"/>
-        </GROUP>
-      </GROUP>
-      <GROUP name="SparseCubeDataset">
-        <DESCRIPTION>Sparse Cube Dataset</DESCRIPTION>
-        <PARAM name="dataProductType" datatype="char" arraysize="5" ucd="meta.id" value="EVENT">
-          <DESCRIPTION>Dataset type</DESCRIPTION>
-        </PARAM>
-        <PARAM name="dataProductSubtype" datatype="char" arraysize="11" ucd="meta.id" value="Sparse Cube">
-          <DESCRIPTION>Dataset subtype</DESCRIPTION>
-        </PARAM>
-        <PARAM name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
-          <DESCRIPTION>Calibration level</DESCRIPTION>
-        </PARAM>
-        <GROUP name="Characterisation">
-          <DESCRIPTION>Characteristics of data coordinate space</DESCRIPTION>
-        </GROUP>
-        <GROUP name="Curation">
-          <DESCRIPTION>Dataset curation metadata</DESCRIPTION>
-          <PARAM name="publisherDID" datatype="char" arraysize="20" ucd="meta.ref.url;meta.curation" value="ADS/Sa.CXO#obs/01838">
-            <DESCRIPTION>Publisher specified dataset ID</DESCRIPTION>
-          </PARAM>
-          <PARAM name="version" datatype="char" arraysize="1" ucd="meta.version;meta.curation" value="1">
-            <DESCRIPTION>Publisher version of the dataset</DESCRIPTION>
-          </PARAM>
-          <PARAM name="releaseDate" datatype="char" arraysize="19" ucd="time.release" value="2015-10-19T15:35:56">
-            <DESCRIPTION>Date curated dataset last modified time.release</DESCRIPTION>
-          </PARAM>
-          <PARAM name="rights" datatype="char" arraysize="6" ucd="meta.code" value="PUBLIC">
-            <DESCRIPTION>Level of access granted</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Contact">
-            <DESCRIPTION>Contact entity for curation service</DESCRIPTION>
-            <GROUP ref="_002J6U7FbgCwoWQF" name="REF_CXCHelpdesk">
-              <DESCRIPTION>Entity associated with Contact role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Publisher">
-            <DESCRIPTION>Publisher</DESCRIPTION>
-            <PARAM name="publisherID" datatype="char" arraysize="3" ucd="meta.ref.url;meta.curation" value="TBD">
-              <DESCRIPTION>URI for VO Publisher</DESCRIPTION>
-            </PARAM>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Entity associated with Publisher role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Publication">
-            <DESCRIPTION>Reference to publication associated with the dataset</DESCRIPTION>
-            <PARAM name="refCode" datatype="char" arraysize="19" ucd="meta.bib.bibcode" value="YYYYJJJJJVVVVMPPPPA">
-              <DESCRIPTION>URL or Bibcode of the publication</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="DataID">
-          <DESCRIPTION>Dataset identification metadata</DESCRIPTION>
-          <PARAM name="title" datatype="char" arraysize="33" ucd="meta.title;meta.dataset" value="HRC RESPONSE TO CONTINUUM SOURCE.">
-            <DESCRIPTION>Dataset Title</DESCRIPTION>
-          </PARAM>
-          <PARAM name="datasetID" datatype="char" arraysize="20" ucd="meta.id;meta.dataset" value="ADS/Sa.CXO#obs/01838">
-            <DESCRIPTION>IVOA Dataset Identifier</DESCRIPTION>
-          </PARAM>
-          <PARAM name="creatorDID" datatype="char" arraysize="20" ucd="meta.id" value="ADS/Sa.CXO#obs/01838">
-            <DESCRIPTION>Creator defined Dataset Identifier</DESCRIPTION>
-          </PARAM>
-          <PARAM name="version" datatype="char" arraysize="1" ucd="meta.version;meta.dataset" value="1">
-            <DESCRIPTION>Dataset version assigned by creator</DESCRIPTION>
-          </PARAM>
-          <PARAM name="date" datatype="char" arraysize="19" ucd="time.epoch;meta.dataset" value="2015-10-19T15:35:56">
-            <DESCRIPTION>Data processing/creation date</DESCRIPTION>
-          </PARAM>
-          <PARAM name="creationType" datatype="char" arraysize="8" value="ARCHIVAL">
-            <DESCRIPTION>Dataset creation type</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Collection">
-            <DESCRIPTION>Collection to which the dataset is a member</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="7" value="Chandra">
-              <DESCRIPTION>Collection name</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-          <GROUP name="Contributor">
-            <DESCRIPTION>Contributor</DESCRIPTION>
-            <PARAM name="acknowledgment" datatype="char" arraysize="129" value="CIAO: Chandra's data analysis system (ADS, PS); Fruscione et al. 2006, SPIE Proc. 6270, 62701V, D.R. Silvia and R.E. Doxsey, eds.">
-              <DESCRIPTION>Acknowledgment expression for the contributor</DESCRIPTION>
-            </PARAM>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Individual associated with Contributor role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Creator">
-            <DESCRIPTION>Institution or entity which created the dataset</DESCRIPTION>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Individual associated with the Creator role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Derived">
-          <DESCRIPTION>Derived metadata</DESCRIPTION>
-          <GROUP name="ONTIME">
-            <DESCRIPTION>property derived from analysis of data content</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="8" value="EXPOSURE">
-              <DESCRIPTION>Total exposure time, with all known corrections</DESCRIPTION>
-            </PARAM>
-            <PARAM name="value" datatype="double" value="9541.71536346" unit="s">
-              <DESCRIPTION>value of derived property</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="ObsConfig">
-          <DESCRIPTION>ObsConfig Object</DESCRIPTION>
-          <PARAM name="bandpass" datatype="char" arraysize="4" ucd="instr.bandpass" value="XRAY">
-            <DESCRIPTION>General regime in spectral domain</DESCRIPTION>
-          </PARAM>
-          <PARAM name="datasource" datatype="char" arraysize="7" value="POINTED">
-            <DESCRIPTION>Original source/type of data</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Facility">
-            <DESCRIPTION>Metadata for the facility performing the observation</DESCRIPTION>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Organization responsible for performing the observation</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Instrument">
-            <DESCRIPTION>Metadata for the Instrument which created the data</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="7" ucd="meta.id;instr" value="CHANDRA">
-              <DESCRIPTION>Instrument ID</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Proposal">
-          <DESCRIPTION>Proposal Object</DESCRIPTION>
-          <PARAM name="identifier" datatype="char" arraysize="8" ucd="meta.id;obs.proposal" value="12345678">
-            <DESCRIPTION>Proposal ID</DESCRIPTION>
-          </PARAM>
-        </GROUP>
-        <GROUP name="AstroTarget">
-          <DESCRIPTION>AstroTarget Object</DESCRIPTION>
-          <PARAM name="name" datatype="char" arraysize="9" ucd="meta.id;src" value="G21.5-0.9">
-            <DESCRIPTION>Target name</DESCRIPTION>
-          </PARAM>
-          <PARAM name="description" datatype="char" arraysize="3" ucd="meta.note;src" value="TBD">
-            <DESCRIPTION>Target descriptive text</DESCRIPTION>
-          </PARAM>
-          <PARAM name="objectClass" datatype="char" arraysize="3" ucd="src.class" value="TBD">
-            <DESCRIPTION>Target or object class</DESCRIPTION>
-          </PARAM>
-          <PARAM name="spectralClass" datatype="char" arraysize="3" ucd="src.spType" value="TBD">
-            <DESCRIPTION>Object spectral class</DESCRIPTION>
-          </PARAM>
-          <PARAM name="redshift" datatype="double" ucd="src.redshift" value="NaN">
-            <DESCRIPTION>Target redshift</DESCRIPTION>
-          </PARAM>
-          <PARAM name="varAmpl" datatype="double" value="NaN">
-            <DESCRIPTION>Target variability amplitude - typical</DESCRIPTION>
-          </PARAM>
-          <GROUP ref="_HPykZjnKKegGJhyB" name="REF_TargetPosition">
-            <DESCRIPTION>Target location (eg: RA, DEC)</DESCRIPTION>
-          </GROUP>
-        </GROUP>
-        <GROUP ref="_L2LRrN4p4HIKaeCj" name="REF_CoordSys-Chip">
-          <DESCRIPTION>Global coordinate systems (Chip)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_6hrehomO3bIilaTo" name="REF_CoordSys-Phys">
-          <DESCRIPTION>Global coordinate systems (Physical)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A18RNKjFBdI7kMap" name="REF_CoordSys-World">
-          <DESCRIPTION>Global coordinate systems (World)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A9OKA8Pw7UvuTGbF" name="REF_SparseCube">
-          <DESCRIPTION>Sparse Cube point data</DESCRIPTION>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_A9OKA8Pw7UvuTGbF" name="SparseCube">
-        <GROUP ID="_L2LRrN4p4HIKaeCj" name="CoordSys-Chip">
-          <DESCRIPTION>Chip Coordinate System</DESCRIPTION>
-          <GROUP ref="_0117pYWsEJmSbhJP" name="REF_TimeFrame"/>
-          <GROUP ref="_010212XxjJ6d2Yfk" name="REF_ChipFrame"/>
-          <GROUP ref="_01290NTXcYmRii44" name="REF_PHAFrame"/>
-        </GROUP>
-        <GROUP ID="_6hrehomO3bIilaTo" name="CoordSys-Phys">
-          <DESCRIPTION>Physical Coordinate System</DESCRIPTION>
-          <GROUP ref="_0117pYWsEJmSbhJP" name="REF_TimeFrame"/>
-          <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame"/>
-          <GROUP ref="_01390NTXcYmRii44" name="REF_PIFrame"/>
-        </GROUP>
-        <GROUP ID="_A18RNKjFBdI7kMap" name="CoordSys-World">
-          <DESCRIPTION>World Coordinate System</DESCRIPTION>
-          <GROUP ref="_0117pYWsEJmSbhJP" name="REF_TimeFrame"/>
-          <GROUP ref="_01016p6qFkb1I2p7" name="REF_ICRSFrame"/>
-          <GROUP ref="_01490NTXcYmRii44" name="REF_EnergyFrame"/>
-        </GROUP>
-        <GROUP name="Mappings">
-          <DESCRIPTION>Frame Transforms</DESCRIPTION>
-          <GROUP name="SKY2EQPOS">
-            <DESCRIPTION>Sky-to-EQPOS Transform</DESCRIPTION>
-            <GROUP name="SKY2EQPOS_Projection">
-              <DESCRIPTION>WCS Projection instance</DESCRIPTION>
-              <PARAM name="algorithm" datatype="char" arraysize="3" value="TAN">
-                <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
-              </PARAM>
-              <GROUP name="SKY2EQPOS_AXIS1">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM name="nativeRefValue" datatype="double" value="4096.5">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="targetRefValue" datatype="double" value="278.386045023">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="scale" datatype="double" value="-0.000136666666667">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-              <GROUP name="SKY2EQPOS_AXIS2">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM name="nativeRefValue" datatype="double" value="4096.5">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="targetRefValue" datatype="double" value="-10.5899133029">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="scale" datatype="double" value="0.000136666666667">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-            </GROUP>
-            <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame">
-              <DESCRIPTION>Originating Frame (sky)</DESCRIPTION>
-            </GROUP>
-            <GROUP ref="_01016p6qFkb1I2p7" name="REF_ICRSFrame">
-              <DESCRIPTION>Resulting Frame (eqpos)</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="NDPoint">
-          <GROUP name="TimeDataAxis">
-            <DESCRIPTION>Time Domain data axis</DESCRIPTION>
-            <GROUP name="TimeData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-time"/>
-                <GROUP ref="_0118WLLnSEBj0p46" name="REF_Time_CoordAxis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="ChipDataAxis">
-            <DESCRIPTION>Spatial Domain data axis - Sky</DESCRIPTION>
-            <GROUP name="ChipData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-chipx"/>
-                <GROUP ref="_0102Kby9hIzCYJPJ" name="REF_Chip_X-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-chipy"/>
-                <GROUP ref="_0102W9piipgxj8Lq" name="REF_Chip_Y-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-ccd_id"/>
-                <GROUP ref="_0102cwvI7yS93aIu" name="REF_Chip_Z-Axis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="SKYDataAxis">
-            <DESCRIPTION>Spatial Domain data axis - Sky</DESCRIPTION>
-            <GROUP name="SKYData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-x"/>
-                <GROUP ref="_0105Kby9hIzCYJPJ" name="REF_Sky_X-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-y"/>
-                <GROUP ref="_0105W9piipgxj8Lq" name="REF_Sky_Y-Axis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="EQPOSDataAxis">
-            <DESCRIPTION>Spatial Domain data axis - EQPOS</DESCRIPTION>
-            <GROUP name="EQPOSData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-ra"/>
-                <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_Theta-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-dec"/>
-                <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_Phi-Axis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="PHADataAxis">
-            <DESCRIPTION>Spectral Domain data axis - PHA</DESCRIPTION>
-            <GROUP name="PHAData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-pha"/>
-                <GROUP ref="_0129ge70cAi4MErU" name="REF_PHA_CoordAxis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="PIDataAxis">
-            <DESCRIPTION>Spectral Domain data axis - PI</DESCRIPTION>
-            <GROUP name="PIData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-pi"/>
-                <GROUP ref="_0139ge70cAi4MErU" name="REF_PI_CoordAxis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="EnergyDataAxis">
-            <DESCRIPTION>Spectral Domain data axis - ENERGY</DESCRIPTION>
-            <GROUP name="EnergyData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-energy"/>
-                <GROUP ref="_0149ge70cAi4MErU" name="REF_Energy_CoordAxis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-      </GROUP>
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM name="name" datatype="char" arraysize="24" value="The Chandra X-Ray Center"/>
+      <PARAM name="address" datatype="char" arraysize="41" value="60 Garden Street, Cambridge, MA 02138 USA"/>
+      <PARAM name="email" datatype="char" arraysize="27" ucd="meta.ref.url;meta.email" value="cxcweb at head.cfa.harvard.edu"/>
+      <PARAM name="phone" datatype="char" arraysize="12" value="617-496-7941"/>
+      <PARAM name="logo" datatype="char" arraysize="52" ucd="meta.ref.url" value="http://chandra.si.edu/graphics/top/icon_cxc_foot.jpg"/>
+      <PARAM name="name" datatype="char" arraysize="19" value="CXC HelpDesk System"/>
+      <PARAM name="address" datatype="char" arraysize="3" value="N/A"/>
+      <PARAM name="email" datatype="char" arraysize="28" ucd="meta.ref.url;meta.email" value="cxchelp at head.cfa.harvard.edu"/>
+      <PARAM name="phone" datatype="char" arraysize="3" value="N/A"/>
+      <PARAM name="timescale" datatype="char" arraysize="2" value="TT"/>
+      <PARAM name="value" datatype="double" value="50814.0"/>
+      <PARAM name="name" datatype="char" arraysize="4" value="time"/>
+      <PARAM name="domainMin" datatype="double" value="-Inf"/>
+      <PARAM name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM name="name" datatype="char" arraysize="3" value="pha"/>
+      <PARAM name="domainMin" datatype="double" value="0" unit="adu"/>
+      <PARAM name="domainMax" datatype="double" value="36855" unit="adu"/>
+      <PARAM name="name" datatype="char" arraysize="2" value="pi"/>
+      <PARAM name="domainMin" datatype="double" value="1" unit="chan"/>
+      <PARAM name="domainMax" datatype="double" value="1024" unit="chan"/>
+      <PARAM name="name" datatype="char" arraysize="6" value="energy"/>
+      <PARAM name="domainMin" datatype="double" value="0.0" unit="eV"/>
+      <PARAM name="domainMax" datatype="double" value="1e+06" unit="eV"/>
+      <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM name="name" datatype="char" arraysize="5" value="chipx"/>
+      <PARAM name="domainMin" datatype="double" value="1" unit="pixel"/>
+      <PARAM name="domainMax" datatype="double" value="1024" unit="pixel"/>
+      <PARAM name="name" datatype="char" arraysize="5" value="chipy"/>
+      <PARAM name="domainMin" datatype="double" value="1" unit="pixel"/>
+      <PARAM name="domainMax" datatype="double" value="1024" unit="pixel"/>
+      <PARAM name="name" datatype="char" arraysize="6" value="ccd_id"/>
+      <PARAM name="domainMin" datatype="int" value="0"/>
+      <PARAM name="domainMax" datatype="int" value="9"/>
+      <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM name="name" datatype="char" arraysize="5" value="tdetx"/>
+      <PARAM name="domainMin" datatype="double" value="1" unit="pixel"/>
+      <PARAM name="domainMax" datatype="double" value="8192" unit="pixel"/>
+      <PARAM name="name" datatype="char" arraysize="5" value="tdety"/>
+      <PARAM name="domainMin" datatype="double" value="1" unit="pixel"/>
+      <PARAM name="domainMax" datatype="double" value="8192" unit="pixel"/>
+      <PARAM name="domainMin" datatype="double" value="0.0"/>
+      <PARAM name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM name="name" datatype="char" arraysize="4" value="detx"/>
+      <PARAM name="domainMin" datatype="double" value="0.5" unit="pixel"/>
+      <PARAM name="domainMax" datatype="double" value="8192.5" unit="pixel"/>
+      <PARAM name="name" datatype="char" arraysize="4" value="dety"/>
+      <PARAM name="domainMin" datatype="double" value="0.5" unit="pixel"/>
+      <PARAM name="domainMax" datatype="double" value="8192.5" unit="pixel"/>
+      <PARAM name="domainMin" datatype="double" value="0.0"/>
+      <PARAM name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM name="name" datatype="char" arraysize="1" value="x"/>
+      <PARAM name="domainMin" datatype="double" value="0.5" unit="pixel"/>
+      <PARAM name="domainMax" datatype="double" value="8192.5" unit="pixel"/>
+      <PARAM name="name" datatype="char" arraysize="1" value="y"/>
+      <PARAM name="domainMin" datatype="double" value="0.5" unit="pixel"/>
+      <PARAM name="domainMax" datatype="double" value="8192.5" unit="pixel"/>
+      <PARAM name="domainMin" datatype="double" value="0.0"/>
+      <PARAM name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM name="orientation" datatype="char" arraysize="4" value="ICRS"/>
+      <PARAM name="type" datatype="char" arraysize="1" value="J"/>
+      <PARAM name="year" datatype="double" value="2000.0"/>
+      <PARAM name="domainMin" datatype="double" value="0"/>
+      <PARAM name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM name="name" datatype="char" arraysize="2" value="ra"/>
+      <PARAM name="domainMin" datatype="double" value="0.0" unit="deg"/>
+      <PARAM name="domainMax" datatype="double" value="360.0" unit="deg"/>
+      <PARAM name="name" datatype="char" arraysize="3" value="dec"/>
+      <PARAM name="domainMin" datatype="double" value="-90.0" unit="deg"/>
+      <PARAM name="domainMax" datatype="double" value="+90.0" unit="deg"/>
+      <PARAM name="loc" datatype="double" value="NaN"/>
+      <PARAM name="loc" datatype="double" value="NaN"/>
+      <PARAM name="dataProductType" datatype="char" arraysize="5" ucd="meta.id" value="EVENT">
+        <DESCRIPTION>Dataset type</DESCRIPTION>
+      </PARAM>
+      <PARAM name="dataProductSubtype" datatype="char" arraysize="11" ucd="meta.id" value="Sparse Cube">
+        <DESCRIPTION>Dataset subtype</DESCRIPTION>
+      </PARAM>
+      <PARAM name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
+        <DESCRIPTION>Calibration level</DESCRIPTION>
+      </PARAM>
+      <PARAM name="publisherDID" datatype="char" arraysize="20" ucd="meta.ref.url;meta.curation" value="ADS/Sa.CXO#obs/01838">
+        <DESCRIPTION>Publisher specified dataset ID</DESCRIPTION>
+      </PARAM>
+      <PARAM name="version" datatype="char" arraysize="1" ucd="meta.version;meta.curation" value="1">
+        <DESCRIPTION>Publisher version of the dataset</DESCRIPTION>
+      </PARAM>
+      <PARAM name="releaseDate" datatype="char" arraysize="19" ucd="time.release" value="2015-10-19T15:35:56">
+        <DESCRIPTION>Date curated dataset last modified time.release</DESCRIPTION>
+      </PARAM>
+      <PARAM name="rights" datatype="char" arraysize="6" ucd="meta.code" value="PUBLIC">
+        <DESCRIPTION>Level of access granted</DESCRIPTION>
+      </PARAM>
+      <PARAM name="publisherID" datatype="char" arraysize="3" ucd="meta.ref.url;meta.curation" value="TBD">
+        <DESCRIPTION>URI for VO Publisher</DESCRIPTION>
+      </PARAM>
+      <PARAM name="refCode" datatype="char" arraysize="19" ucd="meta.bib.bibcode" value="YYYYJJJJJVVVVMPPPPA">
+        <DESCRIPTION>URL or Bibcode of the publication</DESCRIPTION>
+      </PARAM>
+      <PARAM name="title" datatype="char" arraysize="33" ucd="meta.title;meta.dataset" value="HRC RESPONSE TO CONTINUUM SOURCE.">
+        <DESCRIPTION>Dataset Title</DESCRIPTION>
+      </PARAM>
+      <PARAM name="datasetID" datatype="char" arraysize="20" ucd="meta.id;meta.dataset" value="ADS/Sa.CXO#obs/01838">
+        <DESCRIPTION>IVOA Dataset Identifier</DESCRIPTION>
+      </PARAM>
+      <PARAM name="creatorDID" datatype="char" arraysize="20" ucd="meta.id" value="ADS/Sa.CXO#obs/01838">
+        <DESCRIPTION>Creator defined Dataset Identifier</DESCRIPTION>
+      </PARAM>
+      <PARAM name="version" datatype="char" arraysize="1" ucd="meta.version;meta.dataset" value="1">
+        <DESCRIPTION>Dataset version assigned by creator</DESCRIPTION>
+      </PARAM>
+      <PARAM name="date" datatype="char" arraysize="19" ucd="time.epoch;meta.dataset" value="2015-10-19T15:35:56">
+        <DESCRIPTION>Data processing/creation date</DESCRIPTION>
+      </PARAM>
+      <PARAM name="creationType" datatype="char" arraysize="8" value="ARCHIVAL">
+        <DESCRIPTION>Dataset creation type</DESCRIPTION>
+      </PARAM>
+      <PARAM name="name" datatype="char" arraysize="7" value="Chandra">
+        <DESCRIPTION>Collection name</DESCRIPTION>
+      </PARAM>
+      <PARAM name="acknowledgment" datatype="char" arraysize="129" value="CIAO: Chandra's data analysis system (ADS, PS); Fruscione et al. 2006, SPIE Proc. 6270, 62701V, D.R. Silvia and R.E. Doxsey, eds.">
+        <DESCRIPTION>Acknowledgment expression for the contributor</DESCRIPTION>
+      </PARAM>
+      <PARAM name="name" datatype="char" arraysize="8" value="EXPOSURE">
+        <DESCRIPTION>Total exposure time, with all known corrections</DESCRIPTION>
+      </PARAM>
+      <PARAM name="value" datatype="double" value="9541.71536346" unit="s">
+        <DESCRIPTION>value of derived property</DESCRIPTION>
+      </PARAM>
+      <PARAM name="bandpass" datatype="char" arraysize="4" ucd="instr.bandpass" value="XRAY">
+        <DESCRIPTION>General regime in spectral domain</DESCRIPTION>
+      </PARAM>
+      <PARAM name="datasource" datatype="char" arraysize="7" value="POINTED">
+        <DESCRIPTION>Original source/type of data</DESCRIPTION>
+      </PARAM>
+      <PARAM name="name" datatype="char" arraysize="7" ucd="meta.id;instr" value="CHANDRA">
+        <DESCRIPTION>Instrument ID</DESCRIPTION>
+      </PARAM>
+      <PARAM name="identifier" datatype="char" arraysize="8" ucd="meta.id;obs.proposal" value="12345678">
+        <DESCRIPTION>Proposal ID</DESCRIPTION>
+      </PARAM>
+      <PARAM name="name" datatype="char" arraysize="9" ucd="meta.id;src" value="G21.5-0.9">
+        <DESCRIPTION>Target name</DESCRIPTION>
+      </PARAM>
+      <PARAM name="description" datatype="char" arraysize="3" ucd="meta.note;src" value="TBD">
+        <DESCRIPTION>Target descriptive text</DESCRIPTION>
+      </PARAM>
+      <PARAM name="objectClass" datatype="char" arraysize="3" ucd="src.class" value="TBD">
+        <DESCRIPTION>Target or object class</DESCRIPTION>
+      </PARAM>
+      <PARAM name="spectralClass" datatype="char" arraysize="3" ucd="src.spType" value="TBD">
+        <DESCRIPTION>Object spectral class</DESCRIPTION>
+      </PARAM>
+      <PARAM name="redshift" datatype="double" ucd="src.redshift" value="NaN">
+        <DESCRIPTION>Target redshift</DESCRIPTION>
+      </PARAM>
+      <PARAM name="varAmpl" datatype="double" value="NaN">
+        <DESCRIPTION>Target variability amplitude - typical</DESCRIPTION>
+      </PARAM>
+      <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <PARAM name="algorithm" datatype="char" arraysize="3" value="TAN">
+        <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
+      </PARAM>
+      <PARAM name="nativeRefValue" datatype="double" value="4096.5">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="targetRefValue" datatype="double" value="278.386045023">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="scale" datatype="double" value="-0.000136666666667">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="nativeRefValue" datatype="double" value="4096.5">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="targetRefValue" datatype="double" value="-10.5899133029">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="scale" datatype="double" value="0.000136666666667">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
       <!-- Data FIELDs -->
-      <FIELD ID="_col-time" name="time" datatype="double"/>
-      <FIELD ID="_col-chipx" name="chipx" datatype="double"/>
-      <FIELD ID="_col-chipy" name="chipy" datatype="double"/>
-      <FIELD ID="_col-ccd_id" name="ccd_id" datatype="double"/>
-      <FIELD ID="_col-x" name="x" datatype="double"/>
-      <FIELD ID="_col-y" name="y" datatype="double"/>
-      <FIELD ID="_col-ra" name="ra" datatype="double"/>
-      <FIELD ID="_col-dec" name="dec" datatype="double"/>
-      <FIELD ID="_col-pha" name="pha" datatype="double"/>
-      <FIELD ID="_col-pi" name="pi" datatype="double"/>
-      <FIELD ID="_col-energy" name="energy" datatype="double"/>
+      <FIELD ID="_col-time" name="time" datatype="double" unit="s"/>
+      <FIELD ID="_col-chipx" name="chipx" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-chipy" name="chipy" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-ccd_id" name="ccd_id" datatype="int"/>
+      <FIELD ID="_col-x" name="x" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-y" name="y" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-ra" name="ra" datatype="double" unit="deg"/>
+      <FIELD ID="_col-dec" name="dec" datatype="double" unit="deg"/>
+      <FIELD ID="_col-pha" name="pha" datatype="double" unit="adu"/>
+      <FIELD ID="_col-pi" name="pi" datatype="double" unit="chan"/>
+      <FIELD ID="_col-energy" name="energy" datatype="double" unit="eV"/>
       <DATA>
         <FITS extnum="1">
           <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/chandra_events.fits"/>

Modified: trunk/projects/dm/CubeDM-1.0/examples/chandra_events_annotated_byref.vot
==============================================================================
--- trunk/projects/dm/CubeDM-1.0/examples/chandra_events_annotated_byref.vot	Sat Apr 29 00:29:07 2017	(r3993)
+++ trunk/projects/dm/CubeDM-1.0/examples/chandra_events_annotated_byref.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -6,10 +6,6 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
-      <NAME>coordsys</NAME>
-      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml</URL>
-    </MODEL>
-    <MODEL>
       <NAME>cube</NAME>
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml</URL>
     </MODEL>
@@ -22,11 +18,15 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
       <NAME>trans</NAME>
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/trans/STCTrans-2.0.vo-dml.xml</URL>
     </MODEL>
     <GLOBALS>
-      <INSTANCE ID="_001J6U7FbgCwoWQF2" dmtype="ds:party.Organization">
+      <INSTANCE ID="_001J6U7FbgCwoWQF" dmtype="ds:party.Organization">
         <ATTRIBUTE dmrole="ds:party.Party.name">
           <CONSTANT ref="_001LrAjgQQfUzcfv" dmtype="ivoa:string"/>
         </ATTRIBUTE>
@@ -43,7 +43,7 @@
           <CONSTANT ref="_001gfnUmg1OEVIwq" dmtype="ivoa:anyURI"/>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE ID="_002J6U7FbgCwoWQF2" dmtype="ds:party.Individual">
+      <INSTANCE ID="_002J6U7FbgCwoWQF" dmtype="ds:party.Individual">
         <ATTRIBUTE dmrole="ds:party.Party.name">
           <CONSTANT ref="_002LrAjgQQfUzcfv" dmtype="ivoa:string"/>
         </ATTRIBUTE>
@@ -57,35 +57,28 @@
           <CONSTANT ref="_002dDUBXHoOSB9wX" dmtype="ivoa:string"/>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE ID="_0117pYWsEJmSbhJP2" dmtype="coordsys:domain.temporal.TimeFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeFrame.timescale">
-          <CONSTANT ref="_0117wfKnTYv8NLOK" dmtype="coordsys:domain.temporal.TimeScale"/>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeFrame.refPosition">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_0118TZnYKkxxCzyE" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeFrame.offset">
-          <INSTANCE dmtype="coordsys:domain.temporal.TimeOffset">
-            <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeOffset.loc">
+      <INSTANCE ID="_0117pYWsEJmSbhJP" dmtype="coords:domain.temporal.TimeFrame">
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.timescale">
+          <CONSTANT ref="_0117wfKnTYv8NLOK" dmtype="coords:domain.temporal.TimeScale"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.time0">
+          <INSTANCE dmtype="coords:domain.temporal.TimeOffset">
+            <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
               <CONSTANT ref="_0118HEAjt4qRFTI5" dmtype="ivoa:RealQuantity"/>
             </ATTRIBUTE>
           </INSTANCE>
         </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.temporal.TimeFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.temporal.CoordSpace1D">
-            <COMPOSITION dmrole="coordsys:domain.temporal.CoordSpace.axis"> 
-              <INSTANCE ID="_0118WLLnSEBj0p462" dmtype="coordsys:domain.temporal.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.temporal.CoordAxis.name">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.temporal.TimeSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0118WLLnSEBj0p46" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0118cF2Rm82EU45n" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.temporal.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0118cF2Rm82EU45p" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.temporal.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0118ceJK1JFBuxCY" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -93,25 +86,18 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_01290NTXcYmRii442" dmtype="coordsys:domain.spectral.SpectralFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralFrame.refPosition">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_0129bEaqPQiuXGGP" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spectral.SpectralFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spectral.CoordSpace1D">
-            <COMPOSITION dmrole="coordsys:domain.spectral.CoordSpace.axis"> 
-              <INSTANCE ID="_0129ge70cAi4MErU2" dmtype="coordsys:domain.spectral.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.name">
+      <INSTANCE ID="_01290NTXcYmRii44" dmtype="coords:domain.spectral.SpectralFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spectral.SpectralSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0129ge70cAi4MErU" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0129hu1SarMbOnaT" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0129hu1SarMbOnaU" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0129o6A8iklnaxZm" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -119,25 +105,18 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_01390NTXcYmRii442" dmtype="coordsys:domain.spectral.SpectralFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralFrame.refPosition">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_0139bEaqPQiuXGGP" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spectral.SpectralFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spectral.CoordSpace1D">
-            <COMPOSITION dmrole="coordsys:domain.spectral.CoordSpace.axis"> 
-              <INSTANCE ID="_0139ge70cAi4MErU2" dmtype="coordsys:domain.spectral.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.name">
+      <INSTANCE ID="_01390NTXcYmRii44" dmtype="coords:domain.spectral.SpectralFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:CoordSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0139ge70cAi4MErU" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0139hu1SarMbOnaT" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0139hu1SarMbOnaU" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0139o6A8iklnaxZm" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -145,25 +124,18 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_01490NTXcYmRii442" dmtype="coordsys:domain.spectral.SpectralFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralFrame.refPosition">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_0149bEaqPQiuXGGP" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spectral.SpectralFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spectral.CoordSpace1D">
-            <COMPOSITION dmrole="coordsys:domain.spectral.CoordSpace.axis"> 
-              <INSTANCE ID="_0149ge70cAi4MErU2" dmtype="coordsys:domain.spectral.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.name">
+      <INSTANCE ID="_01490NTXcYmRii44" dmtype="coords:domain.spectral.SpectralFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:CoordSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0149ge70cAi4MErU" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0149hu1SarMbOnaT" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0149hu1SarMbOnaU" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0149o6A8iklnaxZm" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -171,50 +143,43 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010212XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_0102GrdyEo0SN7Ds" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <CONSTANT ref="_01021jiJzYdXI6UP" dmtype="coordsys:domain.spatial.StdRefFrame"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE ID="_0102Kby9hIzCYJPJ2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE ID="_010212XxjJ6d2Yfk" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <CONSTANT ref="_01021jiJzYdXI6UP" dmtype="coords:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0102Kby9hIzCYJPJ" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0102OyyH8HFLPhaO" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0102OyyH8HFLPhbO" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0102TEQM98JBAYHu" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_0102W9piipgxj8Lq2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_0102W9piipgxj8Lq" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0102bl4ryZpLwCUc" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0102bl4ryZpLwCUd" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0102bx0oGeMSniEK" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_0102cwvI7yS93aIu2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_0102cwvI7yS93aIu" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0102e3zBfvt1YxKm" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0102e3zBfvt1YxKn" dmtype="ivoa:IntegerQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0102f0jRCn9ZYWEB" dmtype="ivoa:IntegerQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -222,47 +187,40 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010312XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_0103GrdyEo0SN7Ds" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <CONSTANT ref="_01031jiJzYdXI6UP" dmtype="coordsys:domain.spatial.StdRefFrame"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <CONSTANT ref="_01031jiJzYdXI6UP" dmtype="coords:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0103OyyH8HFLPhaO" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0103OyyH8HFLPhbO" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0103TEQM98JBAYHu" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0103bl4ryZpLwCUc" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0103bl4ryZpLwCUd" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0103bx0oGeMSniEK" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0103e3zBfvt1YxKn" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0103f0jRCn9ZYWEB" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -270,47 +228,40 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010412XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_0104GrdyEo0SN7Ds" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <CONSTANT ref="_01041jiJzYdXI6UP" dmtype="coordsys:domain.spatial.StdRefFrame"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <CONSTANT ref="_01041jiJzYdXI6UP" dmtype="coords:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0104OyyH8HFLPhaO" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0104OyyH8HFLPhbO" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0104TEQM98JBAYHu" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0104bl4ryZpLwCUc" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0104bl4ryZpLwCUd" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0104bx0oGeMSniEK" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0104e3zBfvt1YxKn" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0104f0jRCn9ZYWEB" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -318,47 +269,40 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010512XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_0105GrdyEo0SN7Ds" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <CONSTANT ref="_01051jiJzYdXI6UP" dmtype="coordsys:domain.spatial.StdRefFrame"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE ID="_0105Kby9hIzCYJPJ2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE ID="_010512XxjJ6d2Yfk" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <CONSTANT ref="_01051jiJzYdXI6UP" dmtype="coords:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0105Kby9hIzCYJPJ" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0105OyyH8HFLPhaO" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0105OyyH8HFLPhbO" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0105TEQM98JBAYHu" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_0105W9piipgxj8Lq2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_0105W9piipgxj8Lq" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0105bl4ryZpLwCUc" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0105bl4ryZpLwCUd" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0105bx0oGeMSniEK" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0105e3zBfvt1YxKn" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0105f0jRCn9ZYWEB" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -366,57 +310,50 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_01016p6qFkb1I2p72" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_010174BLUAVSMDVw" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <CONSTANT ref="_01016u2XxjJ6d2Yf" dmtype="coordsys:domain.spatial.StdRefFrame"/>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.equinox">
-          <INSTANCE dmtype="coordsys:domain.spatial.Epoch">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.Epoch.type">
-              <CONSTANT ref="_01017fNEHUi0m9rW" dmtype="coordsys:domain.spatial.EpochType"/>
+      <INSTANCE ID="_01016p6qFkb1I2p7" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <CONSTANT ref="_01016u2XxjJ6d2Yf" dmtype="coords:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.equinox">
+          <INSTANCE dmtype="coords:domain.spatial.Epoch">
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.type">
+              <CONSTANT ref="_01017fNEHUi0m9rW" dmtype="coords:domain.spatial.EpochType"/>
             </ATTRIBUTE>
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.Epoch.year">
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.year">
               <CONSTANT ref="_01017foOjpZJkO0E" dmtype="ivoa:real"/>
             </ATTRIBUTE>
           </INSTANCE>
         </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Spherical">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Spherical">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_01017OyyH8HFLPhb" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_01017TEQM98JBAYH" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_01017W9piipgxj8L2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_01017W9piipgxj8L" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_01017bl4ryZpLwCT" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_01017bl4ryZpLwCU" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_01017bx0oGeMSniE" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_01017cwvI7yS93aI2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_01017cwvI7yS93aI" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_01017e3zBfvt1YxJ" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_01017e3zBfvt1YxK" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_01017f0jRCn9ZYWE" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -424,27 +361,31 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_HPykZjnKKegGJhyB2" dmtype="coords:domain.spatial.Position2D">
-        <ATTRIBUTE dmrole="coords:domain.spatial.Position2D.coord">
-          <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-              <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
-            </ATTRIBUTE>
-            <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-              <IDREF>_01017W9piipgxj8L2</IDREF>
-            </REFERENCE>
-          </INSTANCE>
-          <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-              <CONSTANT ref="_HwTBlKFGp2MWVh1Q" dmtype="ivoa:RealQuantity"/>
+      <INSTANCE ID="_HPykZjnKKegGJhyB" dmtype="meas:Position2D">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+            <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_01017W9piipgxj8L</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <CONSTANT ref="_HwTBlKFGp2MWVh1Q" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_01017cwvI7yS93aI</IDREF>
+                </REFERENCE>
+              </INSTANCE>
             </ATTRIBUTE>
-            <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-              <IDREF>_01017cwvI7yS93aI2</IDREF>
-            </REFERENCE>
           </INSTANCE>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE dmtype="cube:SparseCubeDataset">
+      <INSTANCE dmtype="ds:experiment.ObsDataset">
         <ATTRIBUTE dmrole="ds:dataset.Dataset.dataProductType">
           <CONSTANT ref="_07Yrfb1KUNZfOEK8" dmtype="ds:dataset.DataProductType"/>
         </ATTRIBUTE>
@@ -454,10 +395,6 @@
         <ATTRIBUTE dmrole="ds:experiment.ObsDataset.calibLevel">
           <CONSTANT ref="_0GQQpjxvwn9XD0e1" dmtype="ivoa:integer"/>
         </ATTRIBUTE>
-        <COMPOSITION dmrole="ds:experiment.ObsDataset.characterisation"> 
-          <INSTANCE dmtype="ds:experiment.Characterisation">
-          </INSTANCE>
-        </COMPOSITION> 
         <COMPOSITION dmrole="ds:dataset.Dataset.curation"> 
           <INSTANCE dmtype="ds:dataset.Curation">
             <ATTRIBUTE dmrole="ds:dataset.Curation.publisherDID">
@@ -475,7 +412,7 @@
             <COMPOSITION dmrole="ds:dataset.Curation.contact"> 
               <INSTANCE dmtype="ds:dataset.Contact">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_002J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_002J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -485,7 +422,7 @@
                   <CONSTANT ref="_2FyzrxBRroXJYrrJ" dmtype="ivoa:anyURI"/>
                 </ATTRIBUTE>
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -531,14 +468,14 @@
                   <CONSTANT ref="_41oqw2x4Vn7JMqHy" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
             <COMPOSITION dmrole="ds:dataset.DataID.creator"> 
               <INSTANCE dmtype="ds:dataset.Creator">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -569,7 +506,7 @@
             <COMPOSITION dmrole="ds:experiment.ObsConfig.facility"> 
               <INSTANCE dmtype="ds:experiment.Facility">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -610,52 +547,65 @@
               <CONSTANT ref="_1JakggUBNfow3eQQ" dmtype="ivoa:real"/>
             </ATTRIBUTE>
             <REFERENCE dmrole="ds:experiment.BaseTarget.position">
-              <IDREF>_HPykZjnKKegGJhyB2</IDREF>
+              <IDREF>_HPykZjnKKegGJhyB</IDREF>
             </REFERENCE>
           </INSTANCE>
         </COMPOSITION> 
-        <REFERENCE dmrole="ds:experiment.ObsDataset.coordSys">
-          <IDREF>_L2LRrN4p4HIKaeCj2</IDREF>
-          <IDREF>_6hrehomO3bIilaTo2</IDREF>
-          <IDREF>_A18RNKjFBdI7kMap2</IDREF>
-        </REFERENCE>
-        <REFERENCE dmrole="cube:SparseCubeDataset.cube">
-          <IDREF>_A9OKA8Pw7UvuTGbF2</IDREF>
-        </REFERENCE>
       </INSTANCE>
-      <INSTANCE ID="_A9OKA8Pw7UvuTGbF2" dmtype="cube:SparseCube">
+      <INSTANCE dmtype="cube:SparseCube">
         <COMPOSITION dmrole="cube:DataProduct.coordSys"> 
-          <INSTANCE ID="_L2LRrN4p4HIKaeCj2" dmtype="cube:CoordSys">
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.timeFrame">
-              <IDREF>_0117pYWsEJmSbhJP2</IDREF>
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <CONSTANT ref="_010074BLUAVSMDVw" dmtype="coords:domain.spatial.StdRefPosition"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.timeFrame">
+              <IDREF>_0117pYWsEJmSbhJP</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spaceFrame">
-              <IDREF>_010212XxjJ6d2Yfk2</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_010212XxjJ6d2Yfk</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spectralFrame">
-              <IDREF>_01290NTXcYmRii442</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spectralFrame">
+              <IDREF>_01290NTXcYmRii44</IDREF>
             </REFERENCE>
           </INSTANCE>
-          <INSTANCE ID="_6hrehomO3bIilaTo2" dmtype="cube:CoordSys">
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.timeFrame">
-              <IDREF>_0117pYWsEJmSbhJP2</IDREF>
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <CONSTANT ref="_010074BLUAVSMDVw" dmtype="coords:domain.spatial.StdRefPosition"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.timeFrame">
+              <IDREF>_0117pYWsEJmSbhJP</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spaceFrame">
-              <IDREF>_010512XxjJ6d2Yfk2</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_010512XxjJ6d2Yfk</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spectralFrame">
-              <IDREF>_01390NTXcYmRii442</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spectralFrame">
+              <IDREF>_01390NTXcYmRii44</IDREF>
             </REFERENCE>
           </INSTANCE>
-          <INSTANCE ID="_A18RNKjFBdI7kMap2" dmtype="cube:CoordSys">
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.timeFrame">
-              <IDREF>_0117pYWsEJmSbhJP2</IDREF>
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <CONSTANT ref="_010074BLUAVSMDVw" dmtype="coords:domain.spatial.StdRefPosition"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.timeFrame">
+              <IDREF>_0117pYWsEJmSbhJP</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spaceFrame">
-              <IDREF>_01016p6qFkb1I2p72</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_01016p6qFkb1I2p7</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spectralFrame">
-              <IDREF>_01490NTXcYmRii442</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spectralFrame">
+              <IDREF>_01490NTXcYmRii44</IDREF>
             </REFERENCE>
           </INSTANCE>
         </COMPOSITION> 
@@ -695,10 +645,10 @@
                   </INSTANCE>
                 </COMPOSITION> 
                 <REFERENCE dmrole="trans:FrameTransform.nativeFrame">
-                  <IDREF>_010512XxjJ6d2Yfk2</IDREF>
+                  <IDREF>_010512XxjJ6d2Yfk</IDREF>
                 </REFERENCE>
                 <REFERENCE dmrole="trans:FrameTransform.targetFrame">
-                  <IDREF>_01016p6qFkb1I2p72</IDREF>
+                  <IDREF>_01016p6qFkb1I2p7</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -711,145 +661,178 @@
     </GLOBALS>
     <TEMPLATES tableref="_table1">
         <INSTANCE ID="_AK9CaKnrQwqiiyvn3" dmtype="cube:NDPoint">
-          <COMPOSITION dmrole="cube:NDPoint.axis"> 
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords:domain.temporal.Time">
-                  <ATTRIBUTE dmrole="coords:domain.temporal.Time.coord">
-                    <INSTANCE dmtype="coordsys:domain.temporal.TimeCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeOffset.loc">
+          <COMPOSITION dmrole="cube:DataElement.axis"> 
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:TimeMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.temporal.TimeOffset">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
                         <COLUMN ref="_col-time" dmtype="ivoa:RealQuantity"/>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.temporal.TimeCoord.axis">
-                        <IDREF>_0118WLLnSEBj0p462</IDREF>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0118WLLnSEBj0p46</IDREF>
                       </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords:domain.spatial.Position3D">
-                  <ATTRIBUTE dmrole="coords:domain.spatial.Position3D.coord">
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-chipx" dmtype="ivoa:RealQuantity"/>
-                      </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_0102Kby9hIzCYJPJ2</IDREF>
-                      </REFERENCE>
-                    </INSTANCE>
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-chipy" dmtype="ivoa:RealQuantity"/>
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:Position3D">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spatial.SpatialCoord3D">
+                      <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-chipx" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_0102Kby9hIzCYJPJ</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-chipy" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_0102W9piipgxj8Lq</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-ccd_id" dmtype="ivoa:IntegerQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_0102cwvI7yS93aIu</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_0102W9piipgxj8Lq2</IDREF>
-                      </REFERENCE>
-                    </INSTANCE>
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-ccd_id" dmtype="ivoa:RealQuantity"/>
-                      </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_0102cwvI7yS93aIu2</IDREF>
-                      </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords.domain.spatial.Position2D">
-                  <ATTRIBUTE dmrole="coords:domain.spatial.Position2D.coord">
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-x" dmtype="ivoa:RealQuantity"/>
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:Position2D">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+                      <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-x" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_0105Kby9hIzCYJPJ</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-y" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_0105W9piipgxj8Lq</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_0105Kby9hIzCYJPJ2</IDREF>
-                      </REFERENCE>
-                    </INSTANCE>
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-y" dmtype="ivoa:RealQuantity"/>
-                      </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_0105W9piipgxj8Lq2</IDREF>
-                      </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords.domain.spatial.Position2D">
-                  <ATTRIBUTE dmrole="coords:domain.spatial.Position2D.coord">
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-ra" dmtype="ivoa:RealQuantity"/>
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:Position2D">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+                      <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-ra" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_01017W9piipgxj8L</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-dec" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_01017cwvI7yS93aI</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_01017W9piipgxj8L2</IDREF>
-                      </REFERENCE>
-                    </INSTANCE>
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-dec" dmtype="ivoa:RealQuantity"/>
-                      </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_01017cwvI7yS93aI2</IDREF>
-                      </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords:domain.spectral.Energy">
-                  <ATTRIBUTE dmrole="coords:domain.spectral.DerivedSpectralCoordinate.coord">
-                    <INSTANCE dmtype="coordsys:domain.spectral.SpectralCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralCoord.loc">
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:SpectralCoordMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spectral.SpectralValue">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
                         <COLUMN ref="_col-pha" dmtype="ivoa:RealQuantity"/>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spectral.SpectralCoord.axis">
-                        <IDREF>_0129ge70cAi4MErU2</IDREF>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0129ge70cAi4MErU</IDREF>
                       </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords:domain.spectral.Energy">
-                  <ATTRIBUTE dmrole="coords:domain.spectral.DerivedSpectralCoordinate.coord">
-                    <INSTANCE dmtype="coordsys:domain.spectral.SpectralCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralCoord.loc">
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:SpectralCoordMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spectral.SpectralValue">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
                         <COLUMN ref="_col-pi" dmtype="ivoa:RealQuantity"/>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spectral.SpectralCoord.axis">
-                        <IDREF>_0139ge70cAi4MErU2</IDREF>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0139ge70cAi4MErU</IDREF>
                       </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords:domain.spectral.Energy">
-                  <ATTRIBUTE dmrole="coords:domain.spectral.DerivedSpectralCoordinate.coord">
-                    <INSTANCE dmtype="coordsys:domain.spectral.SpectralCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralCoord.loc">
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:SpectralCoordMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spectral.SpectralValue">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
                         <COLUMN ref="_col-energy" dmtype="ivoa:RealQuantity"/>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spectral.SpectralCoord.axis">
-                        <IDREF>_0149ge70cAi4MErU2</IDREF>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0149ge70cAi4MErU</IDREF>
                       </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
@@ -862,558 +845,203 @@
   </VODML>
   <RESOURCE>
     <TABLE ID="_table1">
-      <GROUP ID="_001J6U7FbgCwoWQF" name="SAO">
-        <DESCRIPTION>Smithsonian Astrophysical Observatory</DESCRIPTION>
-        <PARAM ID="_001LrAjgQQfUzcfv" name="name" datatype="char" arraysize="24" value="The Chandra X-Ray Center"/>
-        <PARAM ID="_001QE4mxmePP6gt9" name="address" datatype="char" arraysize="41" value="60 Garden Street, Cambridge, MA 02138 USA"/>
-        <PARAM ID="_001R0jW5TKzkQ8Lz" name="email" datatype="char" arraysize="27" ucd="meta.ref.url;meta.email" value="cxcweb at head.cfa.harvard.edu"/>
-        <PARAM ID="_001dDUBXHoOSB9wX" name="phone" datatype="char" arraysize="12" value="617-496-7941"/>
-        <PARAM ID="_001gfnUmg1OEVIwq" name="logo" datatype="char" arraysize="52" ucd="meta.ref.url" value="http://chandra.si.edu/graphics/top/icon_cxc_foot.jpg"/>
-      </GROUP>
-      <GROUP ID="_002J6U7FbgCwoWQF" name="CXCHelpdesk">
-        <DESCRIPTION>Contact Individual</DESCRIPTION>
-        <PARAM ID="_002LrAjgQQfUzcfv" name="name" datatype="char" arraysize="19" value="CXC HelpDesk System"/>
-        <PARAM ID="_002QE4mxmePP6gt9" name="address" datatype="char" arraysize="3" value="N/A"/>
-        <PARAM ID="_002R0jW5TKzkQ8Lz" name="email" datatype="char" arraysize="28" ucd="meta.ref.url;meta.email" value="cxchelp at head.cfa.harvard.edu"/>
-        <PARAM ID="_002dDUBXHoOSB9wX" name="phone" datatype="char" arraysize="3" value="N/A"/>
-      </GROUP>
-      <GROUP ID="_0117pYWsEJmSbhJP" name="TimeFrame">
-        <DESCRIPTION>TIME - Physical temporal domain frame</DESCRIPTION>
-        <PARAM ID="_0117wfKnTYv8NLOK" name="timescale" datatype="char" arraysize="2" value="TT"/>
-        <GROUP name="refPosition">
-          <PARAM ID="_0118TZnYKkxxCzyE" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <GROUP name="offset">
-          <PARAM ID="_0118HEAjt4qRFTI5" name="loc" datatype="double" value="50814.0"/>
-        </GROUP>
-        <GROUP name="TimeFrame_CoordSpace">
-          <DESCRIPTION>Time coordinate space</DESCRIPTION>
-          <GROUP ID="_0118WLLnSEBj0p46" name="Time_CoordAxis">
-            <DESCRIPTION>time axis</DESCRIPTION>
-            <PARAM ID="_0118cF2Rm82EU45n" name="name" datatype="char" arraysize="4" value="time"/>
-            <PARAM ID="_0118cF2Rm82EU45p" name="domainMin" datatype="double" value="-Inf"/>
-            <PARAM ID="_0118ceJK1JFBuxCY" name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_01290NTXcYmRii44" name="PHAFrame">
-        <DESCRIPTION>PHA - Physical spectral domain frame</DESCRIPTION>
-        <GROUP name="refPosition">
-          <PARAM ID="_0129bEaqPQiuXGGP" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <GROUP name="PHAFrame_CoordSpace">
-          <DESCRIPTION>PHA coordinate space</DESCRIPTION>
-          <GROUP ID="_0129ge70cAi4MErU" name="PHA_CoordAxis">
-            <DESCRIPTION>pha axis</DESCRIPTION>
-            <PARAM ID="_0129hu1SarMbOnaT" name="name" datatype="char" arraysize="3" value="pha"/>
-            <PARAM ID="_0129hu1SarMbOnaU" name="domainMin" datatype="double" value="0" unit="adu"/>
-            <PARAM ID="_0129o6A8iklnaxZm" name="domainMax" datatype="double" value="36855" unit="adu"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_01390NTXcYmRii44" name="PIFrame">
-        <DESCRIPTION>PI - Physical spectral domain frame</DESCRIPTION>
-        <GROUP name="refPosition">
-          <PARAM ID="_0139bEaqPQiuXGGP" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <GROUP name="PIFrame_CoordSpace">
-          <DESCRIPTION>PI coordinate space</DESCRIPTION>
-          <GROUP ID="_0139ge70cAi4MErU" name="PI_CoordAxis">
-            <DESCRIPTION>pi axis</DESCRIPTION>
-            <PARAM ID="_0139hu1SarMbOnaT" name="name" datatype="char" arraysize="2" value="pi"/>
-            <PARAM ID="_0139hu1SarMbOnaU" name="domainMin" datatype="double" value="1" unit="chan"/>
-            <PARAM ID="_0139o6A8iklnaxZm" name="domainMax" datatype="double" value="1024" unit="chan"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_01490NTXcYmRii44" name="EnergyFrame">
-        <DESCRIPTION>Energy - Physical spectral domain frame</DESCRIPTION>
-        <GROUP name="refPosition">
-          <PARAM ID="_0149bEaqPQiuXGGP" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <GROUP name="EnergyFrame_CoordSpace">
-          <DESCRIPTION>Energy coordinate space</DESCRIPTION>
-          <GROUP ID="_0149ge70cAi4MErU" name="Energy_CoordAxis">
-            <DESCRIPTION>energy axis</DESCRIPTION>
-            <PARAM ID="_0149hu1SarMbOnaT" name="name" datatype="char" arraysize="6" value="energy"/>
-            <PARAM ID="_0149hu1SarMbOnaU" name="domainMin" datatype="double" value="0.0" unit="eV"/>
-            <PARAM ID="_0149o6A8iklnaxZm" name="domainMax" datatype="double" value="1e+06" unit="eV"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010212XxjJ6d2Yfk" name="ChipFrame">
-        <DESCRIPTION>CHIP - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM ID="_0102GrdyEo0SN7Ds" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM ID="_01021jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="ChipFrame_CoordSpace">
-          <DESCRIPTION>CHIP coordinate space (Cartesian)</DESCRIPTION>
-          <GROUP ID="_0102Kby9hIzCYJPJ" name="Chip_X-Axis">
-            <DESCRIPTION>chipx axis</DESCRIPTION>
-            <PARAM ID="_0102OyyH8HFLPhaO" name="name" datatype="char" arraysize="5" value="chipx"/>
-            <PARAM ID="_0102OyyH8HFLPhbO" name="domainMin" datatype="double" value="1" unit="pixel"/>
-            <PARAM ID="_0102TEQM98JBAYHu" name="domainMax" datatype="double" value="1024" unit="pixel"/>
-          </GROUP>
-          <GROUP ID="_0102W9piipgxj8Lq" name="Chip_Y-Axis">
-            <DESCRIPTION>chipy axis</DESCRIPTION>
-            <PARAM ID="_0102bl4ryZpLwCUc" name="name" datatype="char" arraysize="5" value="chipy"/>
-            <PARAM ID="_0102bl4ryZpLwCUd" name="domainMin" datatype="double" value="1" unit="pixel"/>
-            <PARAM ID="_0102bx0oGeMSniEK" name="domainMax" datatype="double" value="1024" unit="pixel"/>
-          </GROUP>
-          <GROUP ID="_0102cwvI7yS93aIu" name="Chip_Z-Axis">
-            <DESCRIPTION>ccd_id axis</DESCRIPTION>
-            <PARAM ID="_0102e3zBfvt1YxKm" name="name" datatype="char" arraysize="6" value="ccd_id"/>
-            <PARAM ID="_0102e3zBfvt1YxKn" name="domainMin" datatype="int" value="0"/>
-            <PARAM ID="_0102f0jRCn9ZYWEB" name="domainMax" datatype="int" value="9"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010312XxjJ6d2Yfk" name="TDETFrame">
-        <DESCRIPTION>TDET - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM ID="_0103GrdyEo0SN7Ds" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM ID="_01031jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="TDETFrame_CoordSpace">
-          <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
-          <GROUP name="TDET_X-Axis">
-            <DESCRIPTION>tdetx axis</DESCRIPTION>
-            <PARAM ID="_0103OyyH8HFLPhaO" name="name" datatype="char" arraysize="5" value="tdetx"/>
-            <PARAM ID="_0103OyyH8HFLPhbO" name="domainMin" datatype="double" value="1" unit="pixel"/>
-            <PARAM ID="_0103TEQM98JBAYHu" name="domainMax" datatype="double" value="8192" unit="pixel"/>
-          </GROUP>
-          <GROUP name="TDET_Y-Axis">
-            <DESCRIPTION>tdety axis</DESCRIPTION>
-            <PARAM ID="_0103bl4ryZpLwCUc" name="name" datatype="char" arraysize="5" value="tdety"/>
-            <PARAM ID="_0103bl4ryZpLwCUd" name="domainMin" datatype="double" value="1" unit="pixel"/>
-            <PARAM ID="_0103bx0oGeMSniEK" name="domainMax" datatype="double" value="8192" unit="pixel"/>
-          </GROUP>
-          <GROUP name="TDET_Z-Axis">
-            <DESCRIPTION>z axis</DESCRIPTION>
-            <PARAM ID="_0103e3zBfvt1YxKn" name="domainMin" datatype="double" value="0.0"/>
-            <PARAM ID="_0103f0jRCn9ZYWEB" name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010412XxjJ6d2Yfk" name="DETFrame">
-        <DESCRIPTION>DET - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM ID="_0104GrdyEo0SN7Ds" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM ID="_01041jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="DETFrame_CoordSpace">
-          <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
-          <GROUP name="DET_X-Axis">
-            <DESCRIPTION>detx axis</DESCRIPTION>
-            <PARAM ID="_0104OyyH8HFLPhaO" name="name" datatype="char" arraysize="4" value="detx"/>
-            <PARAM ID="_0104OyyH8HFLPhbO" name="domainMin" datatype="double" value="0.5" unit="pixel"/>
-            <PARAM ID="_0104TEQM98JBAYHu" name="domainMax" datatype="double" value="8192.5" unit="pixel"/>
-          </GROUP>
-          <GROUP name="DET_Y-Axis">
-            <DESCRIPTION>dety axis</DESCRIPTION>
-            <PARAM ID="_0104bl4ryZpLwCUc" name="name" datatype="char" arraysize="4" value="dety"/>
-            <PARAM ID="_0104bl4ryZpLwCUd" name="domainMin" datatype="double" value="0.5" unit="pixel"/>
-            <PARAM ID="_0104bx0oGeMSniEK" name="domainMax" datatype="double" value="8192.5" unit="pixel"/>
-          </GROUP>
-          <GROUP name="DET_Z-Axis">
-            <DESCRIPTION>z axis</DESCRIPTION>
-            <PARAM ID="_0104e3zBfvt1YxKn" name="domainMin" datatype="double" value="0.0"/>
-            <PARAM ID="_0104f0jRCn9ZYWEB" name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010512XxjJ6d2Yfk" name="SkyFrame">
-        <DESCRIPTION>SKY - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM ID="_0105GrdyEo0SN7Ds" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM ID="_01051jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="SkyFrame_CoordSpace">
-          <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
-          <GROUP ID="_0105Kby9hIzCYJPJ" name="Sky_X-Axis">
-            <DESCRIPTION>x axis</DESCRIPTION>
-            <PARAM ID="_0105OyyH8HFLPhaO" name="name" datatype="char" arraysize="1" value="x"/>
-            <PARAM ID="_0105OyyH8HFLPhbO" name="domainMin" datatype="double" value="0.5" unit="pixel"/>
-            <PARAM ID="_0105TEQM98JBAYHu" name="domainMax" datatype="double" value="8192.5" unit="pixel"/>
-          </GROUP>
-          <GROUP ID="_0105W9piipgxj8Lq" name="Sky_Y-Axis">
-            <DESCRIPTION>y axis</DESCRIPTION>
-            <PARAM ID="_0105bl4ryZpLwCUc" name="name" datatype="char" arraysize="1" value="y"/>
-            <PARAM ID="_0105bl4ryZpLwCUd" name="domainMin" datatype="double" value="0.5" unit="pixel"/>
-            <PARAM ID="_0105bx0oGeMSniEK" name="domainMax" datatype="double" value="8192.5" unit="pixel"/>
-          </GROUP>
-          <GROUP name="Sky_Z-Axis">
-            <DESCRIPTION>z axis</DESCRIPTION>
-            <PARAM ID="_0105e3zBfvt1YxKn" name="domainMin" datatype="double" value="0.0"/>
-            <PARAM ID="_0105f0jRCn9ZYWEB" name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_01016p6qFkb1I2p7" name="ICRSFrame">
-        <DESCRIPTION>EQPOS - World spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM ID="_010174BLUAVSMDVw" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM ID="_01016u2XxjJ6d2Yf" name="orientation" datatype="char" arraysize="4" value="ICRS"/>
-        <GROUP name="equinox">
-          <PARAM ID="_01017fNEHUi0m9rW" name="type" datatype="char" arraysize="1" value="J"/>
-          <PARAM ID="_01017foOjpZJkO0E" name="year" datatype="double" value="2000.0"/>
-        </GROUP>
-        <GROUP name="ICRSFrame_CoordSpace">
-          <DESCRIPTION>Spherical coordinate space</DESCRIPTION>
-          <GROUP name="ICRS_R-Axis">
-            <DESCRIPTION>r axis</DESCRIPTION>
-            <PARAM ID="_01017OyyH8HFLPhb" name="domainMin" datatype="double" value="0"/>
-            <PARAM ID="_01017TEQM98JBAYH" name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-          <GROUP ID="_01017W9piipgxj8L" name="ICRS_Theta-Axis">
-            <DESCRIPTION>ra axis</DESCRIPTION>
-            <PARAM ID="_01017bl4ryZpLwCT" name="name" datatype="char" arraysize="2" value="ra"/>
-            <PARAM ID="_01017bl4ryZpLwCU" name="domainMin" datatype="double" value="0.0" unit="deg"/>
-            <PARAM ID="_01017bx0oGeMSniE" name="domainMax" datatype="double" value="360.0" unit="deg"/>
-          </GROUP>
-          <GROUP ID="_01017cwvI7yS93aI" name="ICRS_Phi-Axis">
-            <DESCRIPTION>dec axis</DESCRIPTION>
-            <PARAM ID="_01017e3zBfvt1YxJ" name="name" datatype="char" arraysize="3" value="dec"/>
-            <PARAM ID="_01017e3zBfvt1YxK" name="domainMin" datatype="double" value="-90.0" unit="deg"/>
-            <PARAM ID="_01017f0jRCn9ZYWE" name="domainMax" datatype="double" value="+90.0" unit="deg"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_HPykZjnKKegGJhyB" name="TargetPosition">
-        <GROUP name="coord">
-          <PARAM ID="_HhKAdKcKlhfiUsag" name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_Theta-Axis"/>
-        </GROUP>
-        <GROUP name="coord">
-          <PARAM ID="_HwTBlKFGp2MWVh1Q" name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_Phi-Axis"/>
-        </GROUP>
-      </GROUP>
-      <GROUP name="SparseCubeDataset">
-        <DESCRIPTION>Sparse Cube Dataset</DESCRIPTION>
-        <PARAM ID="_07Yrfb1KUNZfOEK8" name="dataProductType" datatype="char" arraysize="5" ucd="meta.id" value="EVENT">
-          <DESCRIPTION>Dataset type</DESCRIPTION>
-        </PARAM>
-        <PARAM ID="_0DcwmCqLzkpXADh4" name="dataProductSubtype" datatype="char" arraysize="11" ucd="meta.id" value="Sparse Cube">
-          <DESCRIPTION>Dataset subtype</DESCRIPTION>
-        </PARAM>
-        <PARAM ID="_0GQQpjxvwn9XD0e1" name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
-          <DESCRIPTION>Calibration level</DESCRIPTION>
-        </PARAM>
-        <GROUP name="Characterisation">
-          <DESCRIPTION>Characteristics of data coordinate space</DESCRIPTION>
-        </GROUP>
-        <GROUP name="Curation">
-          <DESCRIPTION>Dataset curation metadata</DESCRIPTION>
-          <PARAM ID="_1O5vXPfA8U80BgHg" name="publisherDID" datatype="char" arraysize="20" ucd="meta.ref.url;meta.curation" value="ADS/Sa.CXO#obs/01838">
-            <DESCRIPTION>Publisher specified dataset ID</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1UfAoyYjyHKhMD0H" name="version" datatype="char" arraysize="1" ucd="meta.version;meta.curation" value="1">
-            <DESCRIPTION>Publisher version of the dataset</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1XoOkGpCBycuUMNg" name="releaseDate" datatype="char" arraysize="19" ucd="time.release" value="2015-10-19T15:35:56">
-            <DESCRIPTION>Date curated dataset last modified time.release</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1Yy1BxGML9rCbZm0" name="rights" datatype="char" arraysize="6" ucd="meta.code" value="PUBLIC">
-            <DESCRIPTION>Level of access granted</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Contact">
-            <DESCRIPTION>Contact entity for curation service</DESCRIPTION>
-            <GROUP ref="_002J6U7FbgCwoWQF" name="REF_CXCHelpdesk">
-              <DESCRIPTION>Entity associated with Contact role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Publisher">
-            <DESCRIPTION>Publisher</DESCRIPTION>
-            <PARAM ID="_2FyzrxBRroXJYrrJ" name="publisherID" datatype="char" arraysize="3" ucd="meta.ref.url;meta.curation" value="TBD">
-              <DESCRIPTION>URI for VO Publisher</DESCRIPTION>
-            </PARAM>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Entity associated with Publisher role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Publication">
-            <DESCRIPTION>Reference to publication associated with the dataset</DESCRIPTION>
-            <PARAM ID="_39TH5KgHQA2gDNx7" name="refCode" datatype="char" arraysize="19" ucd="meta.bib.bibcode" value="YYYYJJJJJVVVVMPPPPA">
-              <DESCRIPTION>URL or Bibcode of the publication</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="DataID">
-          <DESCRIPTION>Dataset identification metadata</DESCRIPTION>
-          <PARAM ID="_3BP3wPIobUK2MMPb" name="title" datatype="char" arraysize="33" ucd="meta.title;meta.dataset" value="HRC RESPONSE TO CONTINUUM SOURCE.">
-            <DESCRIPTION>Dataset Title</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_3Ko2JyvGSnp9kPFC" name="datasetID" datatype="char" arraysize="20" ucd="meta.id;meta.dataset" value="ADS/Sa.CXO#obs/01838">
-            <DESCRIPTION>IVOA Dataset Identifier</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_3MNpvGqLmbAgJ0iO" name="creatorDID" datatype="char" arraysize="20" ucd="meta.id" value="ADS/Sa.CXO#obs/01838">
-            <DESCRIPTION>Creator defined Dataset Identifier</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_3czgnsjeBuaz1VA6" name="version" datatype="char" arraysize="1" ucd="meta.version;meta.dataset" value="1">
-            <DESCRIPTION>Dataset version assigned by creator</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_3kusBO5Vi7a8i2Bs" name="date" datatype="char" arraysize="19" ucd="time.epoch;meta.dataset" value="2015-10-19T15:35:56">
-            <DESCRIPTION>Data processing/creation date</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_3lBLZy5MGZtbq6z1" name="creationType" datatype="char" arraysize="8" value="ARCHIVAL">
-            <DESCRIPTION>Dataset creation type</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Collection">
-            <DESCRIPTION>Collection to which the dataset is a member</DESCRIPTION>
-            <PARAM ID="_3zibPIoz0P3g6Vg9" name="name" datatype="char" arraysize="7" value="Chandra">
-              <DESCRIPTION>Collection name</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-          <GROUP name="Contributor">
-            <DESCRIPTION>Contributor</DESCRIPTION>
-            <PARAM ID="_41oqw2x4Vn7JMqHy" name="acknowledgment" datatype="char" arraysize="129" value="CIAO: Chandra's data analysis system (ADS, PS); Fruscione et al. 2006, SPIE Proc. 6270, 62701V, D.R. Silvia and R.E. Doxsey, eds.">
-              <DESCRIPTION>Acknowledgment expression for the contributor</DESCRIPTION>
-            </PARAM>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Individual associated with Contributor role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Creator">
-            <DESCRIPTION>Institution or entity which created the dataset</DESCRIPTION>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Individual associated with the Creator role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Derived">
-          <DESCRIPTION>Derived metadata</DESCRIPTION>
-          <GROUP name="ONTIME">
-            <DESCRIPTION>property derived from analysis of data content</DESCRIPTION>
-            <PARAM ID="_5SLMkv4jJLqDeTHa" name="name" datatype="char" arraysize="8" value="EXPOSURE">
-              <DESCRIPTION>Total exposure time, with all known corrections</DESCRIPTION>
-            </PARAM>
-            <PARAM ID="_5UKRXkncAyseKMgT" name="value" datatype="double" value="9541.71536346" unit="s">
-              <DESCRIPTION>value of derived property</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="ObsConfig">
-          <DESCRIPTION>ObsConfig Object</DESCRIPTION>
-          <PARAM ID="_5UozFhanJugquCM1" name="bandpass" datatype="char" arraysize="4" ucd="instr.bandpass" value="XRAY">
-            <DESCRIPTION>General regime in spectral domain</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_5YfO8GkjuqSEqt2s" name="datasource" datatype="char" arraysize="7" value="POINTED">
-            <DESCRIPTION>Original source/type of data</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Facility">
-            <DESCRIPTION>Metadata for the facility performing the observation</DESCRIPTION>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Organization responsible for performing the observation</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Instrument">
-            <DESCRIPTION>Metadata for the Instrument which created the data</DESCRIPTION>
-            <PARAM ID="_60HpJl6Eph8CdiKZ" name="name" datatype="char" arraysize="7" ucd="meta.id;instr" value="CHANDRA">
-              <DESCRIPTION>Instrument ID</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Proposal">
-          <DESCRIPTION>Proposal Object</DESCRIPTION>
-          <PARAM ID="_60NnazyCoAERdJZn" name="identifier" datatype="char" arraysize="8" ucd="meta.id;obs.proposal" value="12345678">
-            <DESCRIPTION>Proposal ID</DESCRIPTION>
-          </PARAM>
-        </GROUP>
-        <GROUP name="AstroTarget">
-          <DESCRIPTION>AstroTarget Object</DESCRIPTION>
-          <PARAM ID="_0ylm8ZmZQyFkdnQ5" name="name" datatype="char" arraysize="9" ucd="meta.id;src" value="G21.5-0.9">
-            <DESCRIPTION>Target name</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_17h6AWop4BLek351" name="description" datatype="char" arraysize="3" ucd="meta.note;src" value="TBD">
-            <DESCRIPTION>Target descriptive text</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_17uibvmtc6H9lpWs" name="objectClass" datatype="char" arraysize="3" ucd="src.class" value="TBD">
-            <DESCRIPTION>Target or object class</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1CJrcE00bxzwh5x2" name="spectralClass" datatype="char" arraysize="3" ucd="src.spType" value="TBD">
-            <DESCRIPTION>Object spectral class</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1H6gBwZiDI8Xwnbb" name="redshift" datatype="double" ucd="src.redshift" value="NaN">
-            <DESCRIPTION>Target redshift</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1JakggUBNfow3eQQ" name="varAmpl" datatype="double" value="NaN">
-            <DESCRIPTION>Target variability amplitude - typical</DESCRIPTION>
-          </PARAM>
-          <GROUP ref="_HPykZjnKKegGJhyB" name="REF_TargetPosition">
-            <DESCRIPTION>Target location (eg: RA, DEC)</DESCRIPTION>
-          </GROUP>
-        </GROUP>
-        <GROUP ref="_L2LRrN4p4HIKaeCj" name="REF_CoordSys-Chip">
-          <DESCRIPTION>Global coordinate systems (Chip)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_6hrehomO3bIilaTo" name="REF_CoordSys-Phys">
-          <DESCRIPTION>Global coordinate systems (Physical)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A18RNKjFBdI7kMap" name="REF_CoordSys-World">
-          <DESCRIPTION>Global coordinate systems (World)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A9OKA8Pw7UvuTGbF" name="REF_SparseCube">
-          <DESCRIPTION>Sparse Cube point data</DESCRIPTION>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_A9OKA8Pw7UvuTGbF" name="SparseCube">
-        <GROUP ID="_L2LRrN4p4HIKaeCj" name="CoordSys-Chip">
-          <DESCRIPTION>Chip Coordinate System</DESCRIPTION>
-          <GROUP ref="_0117pYWsEJmSbhJP" name="REF_TimeFrame"/>
-          <GROUP ref="_010212XxjJ6d2Yfk" name="REF_ChipFrame"/>
-          <GROUP ref="_01290NTXcYmRii44" name="REF_PHAFrame"/>
-        </GROUP>
-        <GROUP ID="_6hrehomO3bIilaTo" name="CoordSys-Phys">
-          <DESCRIPTION>Physical Coordinate System</DESCRIPTION>
-          <GROUP ref="_0117pYWsEJmSbhJP" name="REF_TimeFrame"/>
-          <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame"/>
-          <GROUP ref="_01390NTXcYmRii44" name="REF_PIFrame"/>
-        </GROUP>
-        <GROUP ID="_A18RNKjFBdI7kMap" name="CoordSys-World">
-          <DESCRIPTION>World Coordinate System</DESCRIPTION>
-          <GROUP ref="_0117pYWsEJmSbhJP" name="REF_TimeFrame"/>
-          <GROUP ref="_01016p6qFkb1I2p7" name="REF_ICRSFrame"/>
-          <GROUP ref="_01490NTXcYmRii44" name="REF_EnergyFrame"/>
-        </GROUP>
-        <GROUP name="Mappings">
-          <DESCRIPTION>Frame Transforms</DESCRIPTION>
-          <GROUP name="SKY2EQPOS">
-            <DESCRIPTION>Sky-to-EQPOS Transform</DESCRIPTION>
-            <GROUP name="SKY2EQPOS_Projection">
-              <DESCRIPTION>WCS Projection instance</DESCRIPTION>
-              <PARAM ID="_EiGlcXZVSiJplxAz" name="algorithm" datatype="char" arraysize="3" value="TAN">
-                <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
-              </PARAM>
-              <GROUP name="SKY2EQPOS_AXIS1">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM ID="_EjwPLdgNb6AmcarD" name="nativeRefValue" datatype="double" value="4096.5">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_EjwtrSyf9qMAAFIk" name="targetRefValue" datatype="double" value="278.386045023">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_Ek0aE6wVGaNtSojR" name="scale" datatype="double" value="-0.000136666666667">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-              <GROUP name="SKY2EQPOS_AXIS2">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM ID="_Eku9k8u8Jo3wSffi" name="nativeRefValue" datatype="double" value="4096.5">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_El3niMh2XAO0IBg3" name="targetRefValue" datatype="double" value="-10.5899133029">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_ElSOA0YK3fVcaZen" name="scale" datatype="double" value="0.000136666666667">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-            </GROUP>
-            <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame">
-              <DESCRIPTION>Originating Frame (sky)</DESCRIPTION>
-            </GROUP>
-            <GROUP ref="_01016p6qFkb1I2p7" name="REF_ICRSFrame">
-              <DESCRIPTION>Resulting Frame (eqpos)</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="NDPoint">
-          <GROUP name="TimeDataAxis">
-            <DESCRIPTION>Time Domain data axis</DESCRIPTION>
-            <GROUP name="TimeData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-time"/>
-                <GROUP ref="_0118WLLnSEBj0p46" name="REF_Time_CoordAxis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="ChipDataAxis">
-            <DESCRIPTION>Spatial Domain data axis - Sky</DESCRIPTION>
-            <GROUP name="ChipData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-chipx"/>
-                <GROUP ref="_0102Kby9hIzCYJPJ" name="REF_Chip_X-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-chipy"/>
-                <GROUP ref="_0102W9piipgxj8Lq" name="REF_Chip_Y-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-ccd_id"/>
-                <GROUP ref="_0102cwvI7yS93aIu" name="REF_Chip_Z-Axis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="SKYDataAxis">
-            <DESCRIPTION>Spatial Domain data axis - Sky</DESCRIPTION>
-            <GROUP name="SKYData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-x"/>
-                <GROUP ref="_0105Kby9hIzCYJPJ" name="REF_Sky_X-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-y"/>
-                <GROUP ref="_0105W9piipgxj8Lq" name="REF_Sky_Y-Axis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="EQPOSDataAxis">
-            <DESCRIPTION>Spatial Domain data axis - EQPOS</DESCRIPTION>
-            <GROUP name="EQPOSData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-ra"/>
-                <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_Theta-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-dec"/>
-                <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_Phi-Axis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="PHADataAxis">
-            <DESCRIPTION>Spectral Domain data axis - PHA</DESCRIPTION>
-            <GROUP name="PHAData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-pha"/>
-                <GROUP ref="_0129ge70cAi4MErU" name="REF_PHA_CoordAxis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="PIDataAxis">
-            <DESCRIPTION>Spectral Domain data axis - PI</DESCRIPTION>
-            <GROUP name="PIData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-pi"/>
-                <GROUP ref="_0139ge70cAi4MErU" name="REF_PI_CoordAxis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="EnergyDataAxis">
-            <DESCRIPTION>Spectral Domain data axis - ENERGY</DESCRIPTION>
-            <GROUP name="EnergyData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-energy"/>
-                <GROUP ref="_0149ge70cAi4MErU" name="REF_Energy_CoordAxis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-      </GROUP>
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM ID="_001LrAjgQQfUzcfv" name="name" datatype="char" arraysize="24" value="The Chandra X-Ray Center"/>
+      <PARAM ID="_001QE4mxmePP6gt9" name="address" datatype="char" arraysize="41" value="60 Garden Street, Cambridge, MA 02138 USA"/>
+      <PARAM ID="_001R0jW5TKzkQ8Lz" name="email" datatype="char" arraysize="27" ucd="meta.ref.url;meta.email" value="cxcweb at head.cfa.harvard.edu"/>
+      <PARAM ID="_001dDUBXHoOSB9wX" name="phone" datatype="char" arraysize="12" value="617-496-7941"/>
+      <PARAM ID="_001gfnUmg1OEVIwq" name="logo" datatype="char" arraysize="52" ucd="meta.ref.url" value="http://chandra.si.edu/graphics/top/icon_cxc_foot.jpg"/>
+      <PARAM ID="_002LrAjgQQfUzcfv" name="name" datatype="char" arraysize="19" value="CXC HelpDesk System"/>
+      <PARAM ID="_002QE4mxmePP6gt9" name="address" datatype="char" arraysize="3" value="N/A"/>
+      <PARAM ID="_002R0jW5TKzkQ8Lz" name="email" datatype="char" arraysize="28" ucd="meta.ref.url;meta.email" value="cxchelp at head.cfa.harvard.edu"/>
+      <PARAM ID="_002dDUBXHoOSB9wX" name="phone" datatype="char" arraysize="3" value="N/A"/>
+      <PARAM ID="_0117wfKnTYv8NLOK" name="timescale" datatype="char" arraysize="2" value="TT"/>
+      <PARAM ID="_0118HEAjt4qRFTI5" name="value" datatype="double" value="50814.0"/>
+      <PARAM ID="_0118cF2Rm82EU45n" name="name" datatype="char" arraysize="4" value="time"/>
+      <PARAM ID="_0118cF2Rm82EU45p" name="domainMin" datatype="double" value="-Inf"/>
+      <PARAM ID="_0118ceJK1JFBuxCY" name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM ID="_0129hu1SarMbOnaT" name="name" datatype="char" arraysize="3" value="pha"/>
+      <PARAM ID="_0129hu1SarMbOnaU" name="domainMin" datatype="double" value="0" unit="adu"/>
+      <PARAM ID="_0129o6A8iklnaxZm" name="domainMax" datatype="double" value="36855" unit="adu"/>
+      <PARAM ID="_0139hu1SarMbOnaT" name="name" datatype="char" arraysize="2" value="pi"/>
+      <PARAM ID="_0139hu1SarMbOnaU" name="domainMin" datatype="double" value="1" unit="chan"/>
+      <PARAM ID="_0139o6A8iklnaxZm" name="domainMax" datatype="double" value="1024" unit="chan"/>
+      <PARAM ID="_0149hu1SarMbOnaT" name="name" datatype="char" arraysize="6" value="energy"/>
+      <PARAM ID="_0149hu1SarMbOnaU" name="domainMin" datatype="double" value="0.0" unit="eV"/>
+      <PARAM ID="_0149o6A8iklnaxZm" name="domainMax" datatype="double" value="1e+06" unit="eV"/>
+      <PARAM ID="_01021jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM ID="_0102OyyH8HFLPhaO" name="name" datatype="char" arraysize="5" value="chipx"/>
+      <PARAM ID="_0102OyyH8HFLPhbO" name="domainMin" datatype="double" value="1" unit="pixel"/>
+      <PARAM ID="_0102TEQM98JBAYHu" name="domainMax" datatype="double" value="1024" unit="pixel"/>
+      <PARAM ID="_0102bl4ryZpLwCUc" name="name" datatype="char" arraysize="5" value="chipy"/>
+      <PARAM ID="_0102bl4ryZpLwCUd" name="domainMin" datatype="double" value="1" unit="pixel"/>
+      <PARAM ID="_0102bx0oGeMSniEK" name="domainMax" datatype="double" value="1024" unit="pixel"/>
+      <PARAM ID="_0102e3zBfvt1YxKm" name="name" datatype="char" arraysize="6" value="ccd_id"/>
+      <PARAM ID="_0102e3zBfvt1YxKn" name="domainMin" datatype="int" value="0"/>
+      <PARAM ID="_0102f0jRCn9ZYWEB" name="domainMax" datatype="int" value="9"/>
+      <PARAM ID="_01031jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM ID="_0103OyyH8HFLPhaO" name="name" datatype="char" arraysize="5" value="tdetx"/>
+      <PARAM ID="_0103OyyH8HFLPhbO" name="domainMin" datatype="double" value="1" unit="pixel"/>
+      <PARAM ID="_0103TEQM98JBAYHu" name="domainMax" datatype="double" value="8192" unit="pixel"/>
+      <PARAM ID="_0103bl4ryZpLwCUc" name="name" datatype="char" arraysize="5" value="tdety"/>
+      <PARAM ID="_0103bl4ryZpLwCUd" name="domainMin" datatype="double" value="1" unit="pixel"/>
+      <PARAM ID="_0103bx0oGeMSniEK" name="domainMax" datatype="double" value="8192" unit="pixel"/>
+      <PARAM ID="_0103e3zBfvt1YxKn" name="domainMin" datatype="double" value="0.0"/>
+      <PARAM ID="_0103f0jRCn9ZYWEB" name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM ID="_01041jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM ID="_0104OyyH8HFLPhaO" name="name" datatype="char" arraysize="4" value="detx"/>
+      <PARAM ID="_0104OyyH8HFLPhbO" name="domainMin" datatype="double" value="0.5" unit="pixel"/>
+      <PARAM ID="_0104TEQM98JBAYHu" name="domainMax" datatype="double" value="8192.5" unit="pixel"/>
+      <PARAM ID="_0104bl4ryZpLwCUc" name="name" datatype="char" arraysize="4" value="dety"/>
+      <PARAM ID="_0104bl4ryZpLwCUd" name="domainMin" datatype="double" value="0.5" unit="pixel"/>
+      <PARAM ID="_0104bx0oGeMSniEK" name="domainMax" datatype="double" value="8192.5" unit="pixel"/>
+      <PARAM ID="_0104e3zBfvt1YxKn" name="domainMin" datatype="double" value="0.0"/>
+      <PARAM ID="_0104f0jRCn9ZYWEB" name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM ID="_01051jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM ID="_0105OyyH8HFLPhaO" name="name" datatype="char" arraysize="1" value="x"/>
+      <PARAM ID="_0105OyyH8HFLPhbO" name="domainMin" datatype="double" value="0.5" unit="pixel"/>
+      <PARAM ID="_0105TEQM98JBAYHu" name="domainMax" datatype="double" value="8192.5" unit="pixel"/>
+      <PARAM ID="_0105bl4ryZpLwCUc" name="name" datatype="char" arraysize="1" value="y"/>
+      <PARAM ID="_0105bl4ryZpLwCUd" name="domainMin" datatype="double" value="0.5" unit="pixel"/>
+      <PARAM ID="_0105bx0oGeMSniEK" name="domainMax" datatype="double" value="8192.5" unit="pixel"/>
+      <PARAM ID="_0105e3zBfvt1YxKn" name="domainMin" datatype="double" value="0.0"/>
+      <PARAM ID="_0105f0jRCn9ZYWEB" name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM ID="_01016u2XxjJ6d2Yf" name="orientation" datatype="char" arraysize="4" value="ICRS"/>
+      <PARAM ID="_01017fNEHUi0m9rW" name="type" datatype="char" arraysize="1" value="J"/>
+      <PARAM ID="_01017foOjpZJkO0E" name="year" datatype="double" value="2000.0"/>
+      <PARAM ID="_01017OyyH8HFLPhb" name="domainMin" datatype="double" value="0"/>
+      <PARAM ID="_01017TEQM98JBAYH" name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM ID="_01017bl4ryZpLwCT" name="name" datatype="char" arraysize="2" value="ra"/>
+      <PARAM ID="_01017bl4ryZpLwCU" name="domainMin" datatype="double" value="0.0" unit="deg"/>
+      <PARAM ID="_01017bx0oGeMSniE" name="domainMax" datatype="double" value="360.0" unit="deg"/>
+      <PARAM ID="_01017e3zBfvt1YxJ" name="name" datatype="char" arraysize="3" value="dec"/>
+      <PARAM ID="_01017e3zBfvt1YxK" name="domainMin" datatype="double" value="-90.0" unit="deg"/>
+      <PARAM ID="_01017f0jRCn9ZYWE" name="domainMax" datatype="double" value="+90.0" unit="deg"/>
+      <PARAM ID="_HhKAdKcKlhfiUsag" name="loc" datatype="double" value="NaN"/>
+      <PARAM ID="_HwTBlKFGp2MWVh1Q" name="loc" datatype="double" value="NaN"/>
+      <PARAM ID="_07Yrfb1KUNZfOEK8" name="dataProductType" datatype="char" arraysize="5" ucd="meta.id" value="EVENT">
+        <DESCRIPTION>Dataset type</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_0DcwmCqLzkpXADh4" name="dataProductSubtype" datatype="char" arraysize="11" ucd="meta.id" value="Sparse Cube">
+        <DESCRIPTION>Dataset subtype</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_0GQQpjxvwn9XD0e1" name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
+        <DESCRIPTION>Calibration level</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1O5vXPfA8U80BgHg" name="publisherDID" datatype="char" arraysize="20" ucd="meta.ref.url;meta.curation" value="ADS/Sa.CXO#obs/01838">
+        <DESCRIPTION>Publisher specified dataset ID</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1UfAoyYjyHKhMD0H" name="version" datatype="char" arraysize="1" ucd="meta.version;meta.curation" value="1">
+        <DESCRIPTION>Publisher version of the dataset</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1XoOkGpCBycuUMNg" name="releaseDate" datatype="char" arraysize="19" ucd="time.release" value="2015-10-19T15:35:56">
+        <DESCRIPTION>Date curated dataset last modified time.release</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1Yy1BxGML9rCbZm0" name="rights" datatype="char" arraysize="6" ucd="meta.code" value="PUBLIC">
+        <DESCRIPTION>Level of access granted</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_2FyzrxBRroXJYrrJ" name="publisherID" datatype="char" arraysize="3" ucd="meta.ref.url;meta.curation" value="TBD">
+        <DESCRIPTION>URI for VO Publisher</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_39TH5KgHQA2gDNx7" name="refCode" datatype="char" arraysize="19" ucd="meta.bib.bibcode" value="YYYYJJJJJVVVVMPPPPA">
+        <DESCRIPTION>URL or Bibcode of the publication</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3BP3wPIobUK2MMPb" name="title" datatype="char" arraysize="33" ucd="meta.title;meta.dataset" value="HRC RESPONSE TO CONTINUUM SOURCE.">
+        <DESCRIPTION>Dataset Title</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3Ko2JyvGSnp9kPFC" name="datasetID" datatype="char" arraysize="20" ucd="meta.id;meta.dataset" value="ADS/Sa.CXO#obs/01838">
+        <DESCRIPTION>IVOA Dataset Identifier</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3MNpvGqLmbAgJ0iO" name="creatorDID" datatype="char" arraysize="20" ucd="meta.id" value="ADS/Sa.CXO#obs/01838">
+        <DESCRIPTION>Creator defined Dataset Identifier</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3czgnsjeBuaz1VA6" name="version" datatype="char" arraysize="1" ucd="meta.version;meta.dataset" value="1">
+        <DESCRIPTION>Dataset version assigned by creator</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3kusBO5Vi7a8i2Bs" name="date" datatype="char" arraysize="19" ucd="time.epoch;meta.dataset" value="2015-10-19T15:35:56">
+        <DESCRIPTION>Data processing/creation date</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3lBLZy5MGZtbq6z1" name="creationType" datatype="char" arraysize="8" value="ARCHIVAL">
+        <DESCRIPTION>Dataset creation type</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3zibPIoz0P3g6Vg9" name="name" datatype="char" arraysize="7" value="Chandra">
+        <DESCRIPTION>Collection name</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_41oqw2x4Vn7JMqHy" name="acknowledgment" datatype="char" arraysize="129" value="CIAO: Chandra's data analysis system (ADS, PS); Fruscione et al. 2006, SPIE Proc. 6270, 62701V, D.R. Silvia and R.E. Doxsey, eds.">
+        <DESCRIPTION>Acknowledgment expression for the contributor</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_5SLMkv4jJLqDeTHa" name="name" datatype="char" arraysize="8" value="EXPOSURE">
+        <DESCRIPTION>Total exposure time, with all known corrections</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_5UKRXkncAyseKMgT" name="value" datatype="double" value="9541.71536346" unit="s">
+        <DESCRIPTION>value of derived property</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_5UozFhanJugquCM1" name="bandpass" datatype="char" arraysize="4" ucd="instr.bandpass" value="XRAY">
+        <DESCRIPTION>General regime in spectral domain</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_5YfO8GkjuqSEqt2s" name="datasource" datatype="char" arraysize="7" value="POINTED">
+        <DESCRIPTION>Original source/type of data</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_60HpJl6Eph8CdiKZ" name="name" datatype="char" arraysize="7" ucd="meta.id;instr" value="CHANDRA">
+        <DESCRIPTION>Instrument ID</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_60NnazyCoAERdJZn" name="identifier" datatype="char" arraysize="8" ucd="meta.id;obs.proposal" value="12345678">
+        <DESCRIPTION>Proposal ID</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_0ylm8ZmZQyFkdnQ5" name="name" datatype="char" arraysize="9" ucd="meta.id;src" value="G21.5-0.9">
+        <DESCRIPTION>Target name</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_17h6AWop4BLek351" name="description" datatype="char" arraysize="3" ucd="meta.note;src" value="TBD">
+        <DESCRIPTION>Target descriptive text</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_17uibvmtc6H9lpWs" name="objectClass" datatype="char" arraysize="3" ucd="src.class" value="TBD">
+        <DESCRIPTION>Target or object class</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1CJrcE00bxzwh5x2" name="spectralClass" datatype="char" arraysize="3" ucd="src.spType" value="TBD">
+        <DESCRIPTION>Object spectral class</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1H6gBwZiDI8Xwnbb" name="redshift" datatype="double" ucd="src.redshift" value="NaN">
+        <DESCRIPTION>Target redshift</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1JakggUBNfow3eQQ" name="varAmpl" datatype="double" value="NaN">
+        <DESCRIPTION>Target variability amplitude - typical</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_010074BLUAVSMDVw" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <PARAM ID="_010074BLUAVSMDVw" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <PARAM ID="_010074BLUAVSMDVw" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <PARAM ID="_EiGlcXZVSiJplxAz" name="algorithm" datatype="char" arraysize="3" value="TAN">
+        <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_EjwPLdgNb6AmcarD" name="nativeRefValue" datatype="double" value="4096.5">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_EjwtrSyf9qMAAFIk" name="targetRefValue" datatype="double" value="278.386045023">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_Ek0aE6wVGaNtSojR" name="scale" datatype="double" value="-0.000136666666667">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_Eku9k8u8Jo3wSffi" name="nativeRefValue" datatype="double" value="4096.5">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_El3niMh2XAO0IBg3" name="targetRefValue" datatype="double" value="-10.5899133029">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_ElSOA0YK3fVcaZen" name="scale" datatype="double" value="0.000136666666667">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
       <!-- Data FIELDs -->
-      <FIELD ID="_col-time" name="time" datatype="double"/>
-      <FIELD ID="_col-chipx" name="chipx" datatype="double"/>
-      <FIELD ID="_col-chipy" name="chipy" datatype="double"/>
-      <FIELD ID="_col-ccd_id" name="ccd_id" datatype="double"/>
-      <FIELD ID="_col-x" name="x" datatype="double"/>
-      <FIELD ID="_col-y" name="y" datatype="double"/>
-      <FIELD ID="_col-ra" name="ra" datatype="double"/>
-      <FIELD ID="_col-dec" name="dec" datatype="double"/>
-      <FIELD ID="_col-pha" name="pha" datatype="double"/>
-      <FIELD ID="_col-pi" name="pi" datatype="double"/>
-      <FIELD ID="_col-energy" name="energy" datatype="double"/>
+      <FIELD ID="_col-time" name="time" datatype="double" unit="s"/>
+      <FIELD ID="_col-chipx" name="chipx" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-chipy" name="chipy" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-ccd_id" name="ccd_id" datatype="int"/>
+      <FIELD ID="_col-x" name="x" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-y" name="y" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-ra" name="ra" datatype="double" unit="deg"/>
+      <FIELD ID="_col-dec" name="dec" datatype="double" unit="deg"/>
+      <FIELD ID="_col-pha" name="pha" datatype="double" unit="adu"/>
+      <FIELD ID="_col-pi" name="pi" datatype="double" unit="chan"/>
+      <FIELD ID="_col-energy" name="energy" datatype="double" unit="eV"/>
       <DATA>
         <FITS extnum="1">
           <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/chandra_events.fits"/>

Modified: trunk/projects/dm/CubeDM-1.0/examples/chandra_grat_events.vot
==============================================================================
--- trunk/projects/dm/CubeDM-1.0/examples/chandra_grat_events.vot	Sat Apr 29 00:29:07 2017	(r3993)
+++ trunk/projects/dm/CubeDM-1.0/examples/chandra_grat_events.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -20,11 +20,8 @@
       <GROUP ID="_0117pYWsEJmSbhJP" name="TimeFrame">
         <DESCRIPTION>TIME - Physical temporal domain frame</DESCRIPTION>
         <PARAM name="timescale" datatype="char" arraysize="2" value="TT"/>
-        <GROUP name="refPosition">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <GROUP name="offset">
-          <PARAM name="loc" datatype="double" value="50814.0"/>
+          <PARAM name="value" datatype="double" value="50814.0"/>
         </GROUP>
         <GROUP name="TimeFrame_CoordSpace">
           <DESCRIPTION>Time coordinate space</DESCRIPTION>
@@ -36,11 +33,8 @@
           </GROUP>
         </GROUP>
       </GROUP>
-      <GROUP ID="_01290NTXcYmRii44" name="PHAFrame">
+      <GROUP name="PHAFrame">
         <DESCRIPTION>PHA - Physical spectral domain frame</DESCRIPTION>
-        <GROUP name="refPosition">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <GROUP name="PHAFrame_CoordSpace">
           <DESCRIPTION>PHA coordinate space</DESCRIPTION>
           <GROUP ID="_0129ge70cAi4MErU" name="PHA_CoordAxis">
@@ -53,9 +47,6 @@
       </GROUP>
       <GROUP ID="_01390NTXcYmRii44" name="PIFrame">
         <DESCRIPTION>PI - Physical spectral domain frame</DESCRIPTION>
-        <GROUP name="refPosition">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <GROUP name="PIFrame_CoordSpace">
           <DESCRIPTION>PI coordinate space</DESCRIPTION>
           <GROUP name="PI_CoordAxis">
@@ -66,11 +57,8 @@
           </GROUP>
         </GROUP>
       </GROUP>
-      <GROUP ID="_010212XxjJ6d2Yfk" name="ChipFrame">
+      <GROUP name="ChipFrame">
         <DESCRIPTION>CHIP - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
         <GROUP name="ChipFrame_CoordSpace">
           <DESCRIPTION>CHIP coordinate space (Cartesian)</DESCRIPTION>
@@ -94,11 +82,8 @@
           </GROUP>
         </GROUP>
       </GROUP>
-      <GROUP ID="_010312XxjJ6d2Yfk" name="TDETFrame">
+      <GROUP name="TDETFrame">
         <DESCRIPTION>TDET - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
         <GROUP name="TDETFrame_CoordSpace">
           <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
@@ -121,11 +106,8 @@
           </GROUP>
         </GROUP>
       </GROUP>
-      <GROUP ID="_010412XxjJ6d2Yfk" name="DETFrame">
+      <GROUP name="DETFrame">
         <DESCRIPTION>DET - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
         <GROUP name="DETFrame_CoordSpace">
           <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
@@ -150,9 +132,6 @@
       </GROUP>
       <GROUP ID="_010512XxjJ6d2Yfk" name="SkyFrame">
         <DESCRIPTION>SKY - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
         <GROUP name="SkyFrame_CoordSpace">
           <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
@@ -177,9 +156,6 @@
       </GROUP>
       <GROUP ID="_01016p6qFkb1I2p7" name="ICRSFrame">
         <DESCRIPTION>EQPOS - World spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
         <PARAM name="orientation" datatype="char" arraysize="4" value="ICRS"/>
         <GROUP name="equinox">
           <PARAM name="type" datatype="char" arraysize="1" value="J"/>
@@ -208,12 +184,14 @@
       </GROUP>
       <GROUP ID="_HPykZjnKKegGJhyB" name="TargetPosition">
         <GROUP name="coord">
-          <PARAM name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_Theta-Axis"/>
-        </GROUP>
-        <GROUP name="coord">
-          <PARAM name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_Phi-Axis"/>
+          <GROUP name="ra">
+            <PARAM name="loc" datatype="double" value="NaN"/>
+            <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_Theta-Axis"/>
+          </GROUP>
+          <GROUP name="dec">
+            <PARAM name="loc" datatype="double" value="NaN"/>
+            <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_Phi-Axis"/>
+          </GROUP>
         </GROUP>
       </GROUP>
       <GROUP name="SparseCubeDataset">
@@ -227,9 +205,6 @@
         <PARAM name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
           <DESCRIPTION>Calibration level</DESCRIPTION>
         </PARAM>
-        <GROUP name="Characterisation">
-          <DESCRIPTION>Characteristics of data coordinate space</DESCRIPTION>
-        </GROUP>
         <GROUP name="Curation">
           <DESCRIPTION>Dataset curation metadata</DESCRIPTION>
           <PARAM name="publisherDID" datatype="char" arraysize="20" ucd="meta.ref.url;meta.curation" value="ADS/Sa.CXO#obs/00460">
@@ -371,27 +346,24 @@
             <DESCRIPTION>Target location (eg: RA, DEC)</DESCRIPTION>
           </GROUP>
         </GROUP>
-        <GROUP ref="_6hrehomO3bIilaTo" name="REF_CoordSys-Phys">
-          <DESCRIPTION>Global coordinate systems (Physical)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A18RNKjFBdI7kMap" name="REF_CoordSys-World">
-          <DESCRIPTION>Global coordinate systems (World)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A9OKA8Pw7UvuTGbF" name="REF_SparseCube">
-          <DESCRIPTION>Sparse Cube point data</DESCRIPTION>
-        </GROUP>
       </GROUP>
-      <GROUP ID="_A9OKA8Pw7UvuTGbF" name="SparseCube">
-        <GROUP ID="_6hrehomO3bIilaTo" name="CoordSys-Phys">
+      <GROUP name="SparseCube">
+        <GROUP name="CoordSys-Phys">
           <DESCRIPTION>Physical Coordinate System</DESCRIPTION>
-          <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame"/>
+          <GROUP name="refPosition">
+            <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+          </GROUP>
           <GROUP ref="_0117pYWsEJmSbhJP" name="REF_TimeFrame"/>
+          <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame"/>
           <GROUP ref="_01390NTXcYmRii44" name="REF_PIFrame"/>
         </GROUP>
-        <GROUP ID="_A18RNKjFBdI7kMap" name="CoordSys-World">
+        <GROUP name="CoordSys-World">
           <DESCRIPTION>World Coordinate System</DESCRIPTION>
-          <GROUP ref="_01016p6qFkb1I2p7" name="REF_ICRSFrame"/>
+          <GROUP name="refPosition">
+            <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+          </GROUP>
           <GROUP ref="_0117pYWsEJmSbhJP" name="REF_TimeFrame"/>
+          <GROUP ref="_01016p6qFkb1I2p7" name="REF_ICRSFrame"/>
           <GROUP ref="_01390NTXcYmRii44" name="REF_PIFrame"/>
         </GROUP>
         <GROUP name="Mappings">
@@ -450,12 +422,14 @@
             <DESCRIPTION>Spatial Domain data axis - Sky</DESCRIPTION>
             <GROUP name="SKYData">
               <GROUP name="coord">
-                <FIELDref ref="_col-x"/>
-                <GROUP ref="_0105Kby9hIzCYJPJ" name="REF_Sky_X-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-y"/>
-                <GROUP ref="_0105W9piipgxj8Lq" name="REF_Sky_Y-Axis"/>
+                <GROUP name="x">
+                  <FIELDref ref="_col-x"/>
+                  <GROUP ref="_0105Kby9hIzCYJPJ" name="REF_Sky_X-Axis"/>
+                </GROUP>
+                <GROUP name="y">
+                  <FIELDref ref="_col-y"/>
+                  <GROUP ref="_0105W9piipgxj8Lq" name="REF_Sky_Y-Axis"/>
+                </GROUP>
               </GROUP>
             </GROUP>
           </GROUP>
@@ -463,12 +437,14 @@
             <DESCRIPTION>Spatial Domain data axis - EQPOS</DESCRIPTION>
             <GROUP name="EQPOSData">
               <GROUP name="coord">
-                <FIELDref ref="_col-ra"/>
-                <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_Theta-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-dec"/>
-                <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_Phi-Axis"/>
+                <GROUP name="ra">
+                  <FIELDref ref="_col-ra"/>
+                  <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_Theta-Axis"/>
+                </GROUP>
+                <GROUP name="dec">
+                  <FIELDref ref="_col-dec"/>
+                  <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_Phi-Axis"/>
+                </GROUP>
               </GROUP>
             </GROUP>
           </GROUP>
@@ -484,12 +460,12 @@
         </GROUP>
       </GROUP>
       <!-- Data FIELDs -->
-      <FIELD ID="_col-time" name="time" datatype="double"/>
-      <FIELD ID="_col-x" name="x" datatype="double"/>
-      <FIELD ID="_col-y" name="y" datatype="double"/>
-      <FIELD ID="_col-ra" name="ra" datatype="double"/>
-      <FIELD ID="_col-dec" name="dec" datatype="double"/>
-      <FIELD ID="_col-pha" name="pha" datatype="double"/>
+      <FIELD ID="_col-time" name="time" datatype="double" unit="s"/>
+      <FIELD ID="_col-x" name="x" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-y" name="y" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-ra" name="ra" datatype="double" unit="deg"/>
+      <FIELD ID="_col-dec" name="dec" datatype="double" unit="deg"/>
+      <FIELD ID="_col-pha" name="pha" datatype="double" unit="chan"/>
       <DATA>
         <FITS extnum="1">
           <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/chandra_grat_events.fits"/>

Modified: trunk/projects/dm/CubeDM-1.0/examples/chandra_grat_events_annotated.vot
==============================================================================
--- trunk/projects/dm/CubeDM-1.0/examples/chandra_grat_events_annotated.vot	Sat Apr 29 00:29:07 2017	(r3993)
+++ trunk/projects/dm/CubeDM-1.0/examples/chandra_grat_events_annotated.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -6,10 +6,6 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
-      <NAME>coordsys</NAME>
-      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml</URL>
-    </MODEL>
-    <MODEL>
       <NAME>cube</NAME>
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml</URL>
     </MODEL>
@@ -22,11 +18,15 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
       <NAME>trans</NAME>
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/trans/STCTrans-2.0.vo-dml.xml</URL>
     </MODEL>
     <GLOBALS>
-      <INSTANCE ID="_001J6U7FbgCwoWQF2" dmtype="ds:party.Organization">
+      <INSTANCE ID="_001J6U7FbgCwoWQF" dmtype="ds:party.Organization">
         <ATTRIBUTE dmrole="ds:party.Party.name">
           <LITERAL dmtype="ivoa:string" value="The Chandra X-Ray Center"/>
         </ATTRIBUTE>
@@ -43,7 +43,7 @@
           <LITERAL dmtype="ivoa:anyURI" value="http://chandra.si.edu/graphics/top/icon_cxc_foot.jpg"/>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE ID="_002J6U7FbgCwoWQF2" dmtype="ds:party.Individual">
+      <INSTANCE ID="_002J6U7FbgCwoWQF" dmtype="ds:party.Individual">
         <ATTRIBUTE dmrole="ds:party.Party.name">
           <LITERAL dmtype="ivoa:string" value="CXC HelpDesk System"/>
         </ATTRIBUTE>
@@ -57,35 +57,28 @@
           <LITERAL dmtype="ivoa:string" value="N/A"/>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE ID="_0117pYWsEJmSbhJP2" dmtype="coordsys:domain.temporal.TimeFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeFrame.timescale">
-          <LITERAL dmtype="coordsys:domain.temporal.TimeScale" value="TT"/>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeFrame.refPosition">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeFrame.offset">
-          <INSTANCE dmtype="coordsys:domain.temporal.TimeOffset">
-            <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeOffset.loc">
+      <INSTANCE ID="_0117pYWsEJmSbhJP" dmtype="coords:domain.temporal.TimeFrame">
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.timescale">
+          <LITERAL dmtype="coords:domain.temporal.TimeScale" value="TT"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.time0">
+          <INSTANCE dmtype="coords:domain.temporal.TimeOffset">
+            <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
               <LITERAL dmtype="ivoa:RealQuantity" value="50814.0"/>
             </ATTRIBUTE>
           </INSTANCE>
         </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.temporal.TimeFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.temporal.CoordSpace1D">
-            <COMPOSITION dmrole="coordsys:domain.temporal.CoordSpace.axis"> 
-              <INSTANCE ID="_0118WLLnSEBj0p462" dmtype="coordsys:domain.temporal.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.temporal.CoordAxis.name">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.temporal.TimeSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0118WLLnSEBj0p46" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="time"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.temporal.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" value="-Inf"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.temporal.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -93,25 +86,18 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_01290NTXcYmRii442" dmtype="coordsys:domain.spectral.SpectralFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralFrame.refPosition">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spectral.SpectralFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spectral.CoordSpace1D">
-            <COMPOSITION dmrole="coordsys:domain.spectral.CoordSpace.axis"> 
-              <INSTANCE ID="_0129ge70cAi4MErU2" dmtype="coordsys:domain.spectral.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.name">
+      <INSTANCE dmtype="coords:domain.spectral.SpectralFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spectral.SpectralSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0129ge70cAi4MErU" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="pha"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="chan" value="0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="chan" value="255"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -119,25 +105,18 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_01390NTXcYmRii442" dmtype="coordsys:domain.spectral.SpectralFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralFrame.refPosition">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spectral.SpectralFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spectral.CoordSpace1D">
-            <COMPOSITION dmrole="coordsys:domain.spectral.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spectral.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.name">
+      <INSTANCE ID="_01390NTXcYmRii44" dmtype="coords:domain.spectral.SpectralFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spectral.SpectralSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="pi"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="chan" value="0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="chan" value="1023"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -145,50 +124,43 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010212XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <LITERAL dmtype="coordsys:domain.spatial.StdRefFrame" value="CUSTOM"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="CUSTOM"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="chipx"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="1"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="4096"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="chipy"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="1"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="16456"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="ccd_id"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:IntegerQuantity" value="1"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:IntegerQuantity" value="3"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -196,47 +168,40 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010312XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <LITERAL dmtype="coordsys:domain.spatial.StdRefFrame" value="CUSTOM"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="CUSTOM"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="tdetx"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="1"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="4096"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="tdety"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="1"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="49368"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" value="0.0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -244,47 +209,40 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010412XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <LITERAL dmtype="coordsys:domain.spatial.StdRefFrame" value="CUSTOM"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="CUSTOM"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="detx"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="0.5"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="65536.5"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="dety"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="0.5"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="65536.5"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" value="0.0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -292,47 +250,40 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010512XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <LITERAL dmtype="coordsys:domain.spatial.StdRefFrame" value="CUSTOM"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE ID="_0105Kby9hIzCYJPJ2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE ID="_010512XxjJ6d2Yfk" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="CUSTOM"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0105Kby9hIzCYJPJ" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="x"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="0.5"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="65536.5"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_0105W9piipgxj8Lq2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_0105W9piipgxj8Lq" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="y"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="0.5"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="pixel" value="65536.5"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" value="0.0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -340,57 +291,50 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_01016p6qFkb1I2p72" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <LITERAL dmtype="coordsys:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
+      <INSTANCE ID="_01016p6qFkb1I2p7" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="ICRS"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.equinox">
+          <INSTANCE dmtype="coords:domain.spatial.Epoch">
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.type">
+              <LITERAL dmtype="coords:domain.spatial.EpochType" value="J"/>
             </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <LITERAL dmtype="coordsys:domain.spatial.StdRefFrame" value="ICRS"/>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.equinox">
-          <INSTANCE dmtype="coordsys:domain.spatial.Epoch">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.Epoch.type">
-              <LITERAL dmtype="coordsys:domain.spatial.EpochType" value="J"/>
-            </ATTRIBUTE>
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.Epoch.year">
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.year">
               <LITERAL dmtype="ivoa:real" value="2000.0"/>
             </ATTRIBUTE>
           </INSTANCE>
         </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Spherical">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Spherical">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" value="0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_01017W9piipgxj8L2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_01017W9piipgxj8L" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="ra"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="0.0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="360.0"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_01017cwvI7yS93aI2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_01017cwvI7yS93aI" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <LITERAL dmtype="ivoa:string" value="dec"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="-90.0"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="+90.0"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -398,27 +342,31 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_HPykZjnKKegGJhyB2" dmtype="coords:domain.spatial.Position2D">
-        <ATTRIBUTE dmrole="coords:domain.spatial.Position2D.coord">
-          <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-              <LITERAL dmtype="ivoa:RealQuantity" value="NaN"/>
-            </ATTRIBUTE>
-            <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-              <IDREF>_01017W9piipgxj8L2</IDREF>
-            </REFERENCE>
-          </INSTANCE>
-          <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-              <LITERAL dmtype="ivoa:RealQuantity" value="NaN"/>
+      <INSTANCE ID="_HPykZjnKKegGJhyB" dmtype="meas:Position2D">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+            <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="NaN"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_01017W9piipgxj8L</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="NaN"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_01017cwvI7yS93aI</IDREF>
+                </REFERENCE>
+              </INSTANCE>
             </ATTRIBUTE>
-            <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-              <IDREF>_01017cwvI7yS93aI2</IDREF>
-            </REFERENCE>
           </INSTANCE>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE dmtype="cube:SparseCubeDataset">
+      <INSTANCE dmtype="ds:experiment.ObsDataset">
         <ATTRIBUTE dmrole="ds:dataset.Dataset.dataProductType">
           <LITERAL dmtype="ds:dataset.DataProductType" value="EVENT"/>
         </ATTRIBUTE>
@@ -428,10 +376,6 @@
         <ATTRIBUTE dmrole="ds:experiment.ObsDataset.calibLevel">
           <LITERAL dmtype="ivoa:integer" value="3"/>
         </ATTRIBUTE>
-        <COMPOSITION dmrole="ds:experiment.ObsDataset.characterisation"> 
-          <INSTANCE dmtype="ds:experiment.Characterisation">
-          </INSTANCE>
-        </COMPOSITION> 
         <COMPOSITION dmrole="ds:dataset.Dataset.curation"> 
           <INSTANCE dmtype="ds:dataset.Curation">
             <ATTRIBUTE dmrole="ds:dataset.Curation.publisherDID">
@@ -449,7 +393,7 @@
             <COMPOSITION dmrole="ds:dataset.Curation.contact"> 
               <INSTANCE dmtype="ds:dataset.Contact">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_002J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_002J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -459,7 +403,7 @@
                   <LITERAL dmtype="ivoa:anyURI" value="TBD"/>
                 </ATTRIBUTE>
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -505,14 +449,14 @@
                   <LITERAL dmtype="ivoa:string" value="CIAO: Chandra's data analysis system (ADS, PS); Fruscione et al. 2006, SPIE Proc. 6270, 62701V, D.R. Silvia and R.E. Doxsey, eds."/>
                 </ATTRIBUTE>
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
             <COMPOSITION dmrole="ds:dataset.DataID.creator"> 
               <INSTANCE dmtype="ds:dataset.Creator">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -543,7 +487,7 @@
             <COMPOSITION dmrole="ds:experiment.ObsConfig.facility"> 
               <INSTANCE dmtype="ds:experiment.Facility">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -584,40 +528,47 @@
               <LITERAL dmtype="ivoa:real" value="NaN"/>
             </ATTRIBUTE>
             <REFERENCE dmrole="ds:experiment.BaseTarget.position">
-              <IDREF>_HPykZjnKKegGJhyB2</IDREF>
+              <IDREF>_HPykZjnKKegGJhyB</IDREF>
             </REFERENCE>
           </INSTANCE>
         </COMPOSITION> 
-        <REFERENCE dmrole="ds:experiment.ObsDataset.coordSys">
-          <IDREF>_6hrehomO3bIilaTo2</IDREF>
-          <IDREF>_A18RNKjFBdI7kMap2</IDREF>
-        </REFERENCE>
-        <REFERENCE dmrole="cube:SparseCubeDataset.cube">
-          <IDREF>_A9OKA8Pw7UvuTGbF2</IDREF>
-        </REFERENCE>
       </INSTANCE>
-      <INSTANCE ID="_A9OKA8Pw7UvuTGbF2" dmtype="cube:SparseCube">
+      <INSTANCE dmtype="cube:SparseCube">
         <COMPOSITION dmrole="cube:DataProduct.coordSys"> 
-          <INSTANCE ID="_6hrehomO3bIilaTo2" dmtype="cube:CoordSys">
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spaceFrame">
-              <IDREF>_010512XxjJ6d2Yfk2</IDREF>
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <LITERAL dmtype="coords:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.timeFrame">
+              <IDREF>_0117pYWsEJmSbhJP</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.timeFrame">
-              <IDREF>_0117pYWsEJmSbhJP2</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_010512XxjJ6d2Yfk</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spectralFrame">
-              <IDREF>_01390NTXcYmRii442</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spectralFrame">
+              <IDREF>_01390NTXcYmRii44</IDREF>
             </REFERENCE>
           </INSTANCE>
-          <INSTANCE ID="_A18RNKjFBdI7kMap2" dmtype="cube:CoordSys">
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spaceFrame">
-              <IDREF>_01016p6qFkb1I2p72</IDREF>
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <LITERAL dmtype="coords:domain.spatial.StdRefPosition" value="TOPOCENTER"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.timeFrame">
+              <IDREF>_0117pYWsEJmSbhJP</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.timeFrame">
-              <IDREF>_0117pYWsEJmSbhJP2</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_01016p6qFkb1I2p7</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spectralFrame">
-              <IDREF>_01390NTXcYmRii442</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spectralFrame">
+              <IDREF>_01390NTXcYmRii44</IDREF>
             </REFERENCE>
           </INSTANCE>
         </COMPOSITION> 
@@ -657,10 +608,10 @@
                   </INSTANCE>
                 </COMPOSITION> 
                 <REFERENCE dmrole="trans:FrameTransform.nativeFrame">
-                  <IDREF>_010512XxjJ6d2Yfk2</IDREF>
+                  <IDREF>_010512XxjJ6d2Yfk</IDREF>
                 </REFERENCE>
                 <REFERENCE dmrole="trans:FrameTransform.targetFrame">
-                  <IDREF>_01016p6qFkb1I2p72</IDREF>
+                  <IDREF>_01016p6qFkb1I2p7</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -673,81 +624,101 @@
     </GLOBALS>
     <TEMPLATES tableref="_table1">
         <INSTANCE ID="_AK9CaKnrQwqiiyvn3" dmtype="cube:NDPoint">
-          <COMPOSITION dmrole="cube:NDPoint.axis"> 
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords.domain.temporal.Time">
-                  <ATTRIBUTE dmrole="coords:domain.temporal.Time.coord">
-                    <INSTANCE dmtype="coordsys:domain.temporal.TimeCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeOffset.loc">
+          <COMPOSITION dmrole="cube:DataElement.axis"> 
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:TimeMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.temporal.TimeOffset">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
                         <COLUMN ref="_col-time" dmtype="ivoa:RealQuantity"/>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.temporal.TimeCoord.axis">
-                        <IDREF>_0118WLLnSEBj0p462</IDREF>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0118WLLnSEBj0p46</IDREF>
                       </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords:domain.spatial.Position2D">
-                  <ATTRIBUTE dmrole="coords:domain.spatial.Position2D.coord">
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-x" dmtype="ivoa:RealQuantity"/>
-                      </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_0105Kby9hIzCYJPJ2</IDREF>
-                      </REFERENCE>
-                    </INSTANCE>
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-y" dmtype="ivoa:RealQuantity"/>
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:Position2D">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+                      <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-x" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_0105Kby9hIzCYJPJ</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-y" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_0105W9piipgxj8Lq</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_0105W9piipgxj8Lq2</IDREF>
-                      </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords:domain.spatial.Position2D">
-                  <ATTRIBUTE dmrole="coords:domain.spatial.Position2D.coord">
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-ra" dmtype="ivoa:RealQuantity"/>
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:Position2D">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+                      <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-ra" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_01017W9piipgxj8L</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-dec" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_01017cwvI7yS93aI</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_01017W9piipgxj8L2</IDREF>
-                      </REFERENCE>
-                    </INSTANCE>
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-dec" dmtype="ivoa:RealQuantity"/>
-                      </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_01017cwvI7yS93aI2</IDREF>
-                      </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords:domain.spectral.Energy">
-                  <ATTRIBUTE dmrole="coords:domain.spectral.DerivedSpectralCoordinate.coord">
-                    <INSTANCE dmtype="coordsys:domain.spectral.SpectralCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralCoord.loc">
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:SpectralCoordMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spectral.SpectralValue">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
                         <COLUMN ref="_col-pha" dmtype="ivoa:RealQuantity"/>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spectral.SpectralCoord.axis">
-                        <IDREF>_0129ge70cAi4MErU2</IDREF>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0129ge70cAi4MErU</IDREF>
                       </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
@@ -760,494 +731,194 @@
   </VODML>
   <RESOURCE>
     <TABLE ID="_table1">
-      <GROUP ID="_001J6U7FbgCwoWQF" name="SAO">
-        <DESCRIPTION>Smithsonian Astrophysical Observatory</DESCRIPTION>
-        <PARAM name="name" datatype="char" arraysize="24" value="The Chandra X-Ray Center"/>
-        <PARAM name="address" datatype="char" arraysize="41" value="60 Garden Street, Cambridge, MA 02138 USA"/>
-        <PARAM name="email" datatype="char" arraysize="27" ucd="meta.ref.url;meta.email" value="cxcweb at head.cfa.harvard.edu"/>
-        <PARAM name="phone" datatype="char" arraysize="12" value="617-496-7941"/>
-        <PARAM name="logo" datatype="char" arraysize="52" ucd="meta.ref.url" value="http://chandra.si.edu/graphics/top/icon_cxc_foot.jpg"/>
-      </GROUP>
-      <GROUP ID="_002J6U7FbgCwoWQF" name="CXCHelpdesk">
-        <DESCRIPTION>Contact Individual</DESCRIPTION>
-        <PARAM name="name" datatype="char" arraysize="19" value="CXC HelpDesk System"/>
-        <PARAM name="address" datatype="char" arraysize="3" value="N/A"/>
-        <PARAM name="email" datatype="char" arraysize="28" ucd="meta.ref.url;meta.email" value="cxchelp at head.cfa.harvard.edu"/>
-        <PARAM name="phone" datatype="char" arraysize="3" value="N/A"/>
-      </GROUP>
-      <GROUP ID="_0117pYWsEJmSbhJP" name="TimeFrame">
-        <DESCRIPTION>TIME - Physical temporal domain frame</DESCRIPTION>
-        <PARAM name="timescale" datatype="char" arraysize="2" value="TT"/>
-        <GROUP name="refPosition">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <GROUP name="offset">
-          <PARAM name="loc" datatype="double" value="50814.0"/>
-        </GROUP>
-        <GROUP name="TimeFrame_CoordSpace">
-          <DESCRIPTION>Time coordinate space</DESCRIPTION>
-          <GROUP ID="_0118WLLnSEBj0p46" name="Time_CoordAxis">
-            <DESCRIPTION>time axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="4" value="time"/>
-            <PARAM name="domainMin" datatype="double" value="-Inf"/>
-            <PARAM name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_01290NTXcYmRii44" name="PHAFrame">
-        <DESCRIPTION>PHA - Physical spectral domain frame</DESCRIPTION>
-        <GROUP name="refPosition">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <GROUP name="PHAFrame_CoordSpace">
-          <DESCRIPTION>PHA coordinate space</DESCRIPTION>
-          <GROUP ID="_0129ge70cAi4MErU" name="PHA_CoordAxis">
-            <DESCRIPTION>pha axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="3" value="pha"/>
-            <PARAM name="domainMin" datatype="double" value="0" unit="chan"/>
-            <PARAM name="domainMax" datatype="double" value="255" unit="chan"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_01390NTXcYmRii44" name="PIFrame">
-        <DESCRIPTION>PI - Physical spectral domain frame</DESCRIPTION>
-        <GROUP name="refPosition">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <GROUP name="PIFrame_CoordSpace">
-          <DESCRIPTION>PI coordinate space</DESCRIPTION>
-          <GROUP name="PI_CoordAxis">
-            <DESCRIPTION>pi axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="2" value="pi"/>
-            <PARAM name="domainMin" datatype="double" value="0" unit="chan"/>
-            <PARAM name="domainMax" datatype="double" value="1023" unit="chan"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010212XxjJ6d2Yfk" name="ChipFrame">
-        <DESCRIPTION>CHIP - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="ChipFrame_CoordSpace">
-          <DESCRIPTION>CHIP coordinate space (Cartesian)</DESCRIPTION>
-          <GROUP name="Chip_X-Axis">
-            <DESCRIPTION>chipx axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="5" value="chipx"/>
-            <PARAM name="domainMin" datatype="double" value="1" unit="pixel"/>
-            <PARAM name="domainMax" datatype="double" value="4096" unit="pixel"/>
-          </GROUP>
-          <GROUP name="Chip_Y-Axis">
-            <DESCRIPTION>chipy axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="5" value="chipy"/>
-            <PARAM name="domainMin" datatype="double" value="1" unit="pixel"/>
-            <PARAM name="domainMax" datatype="double" value="16456" unit="pixel"/>
-          </GROUP>
-          <GROUP name="Chip_Z-Axis">
-            <DESCRIPTION>chip_id axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="6" value="ccd_id"/>
-            <PARAM name="domainMin" datatype="int" value="1"/>
-            <PARAM name="domainMax" datatype="int" value="3"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010312XxjJ6d2Yfk" name="TDETFrame">
-        <DESCRIPTION>TDET - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="TDETFrame_CoordSpace">
-          <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
-          <GROUP name="TDET_X-Axis">
-            <DESCRIPTION>tdetx axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="5" value="tdetx"/>
-            <PARAM name="domainMin" datatype="double" value="1" unit="pixel"/>
-            <PARAM name="domainMax" datatype="double" value="4096" unit="pixel"/>
-          </GROUP>
-          <GROUP name="TDET_Y-Axis">
-            <DESCRIPTION>tdety axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="5" value="tdety"/>
-            <PARAM name="domainMin" datatype="double" value="1" unit="pixel"/>
-            <PARAM name="domainMax" datatype="double" value="49368" unit="pixel"/>
-          </GROUP>
-          <GROUP name="TDET_Z-Axis">
-            <DESCRIPTION>z axis</DESCRIPTION>
-            <PARAM name="domainMin" datatype="double" value="0.0"/>
-            <PARAM name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010412XxjJ6d2Yfk" name="DETFrame">
-        <DESCRIPTION>DET - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="DETFrame_CoordSpace">
-          <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
-          <GROUP name="DET_X-Axis">
-            <DESCRIPTION>detx axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="4" value="detx"/>
-            <PARAM name="domainMin" datatype="double" value="0.5" unit="pixel"/>
-            <PARAM name="domainMax" datatype="double" value="65536.5" unit="pixel"/>
-          </GROUP>
-          <GROUP name="DET_Y-Axis">
-            <DESCRIPTION>dety axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="4" value="dety"/>
-            <PARAM name="domainMin" datatype="double" value="0.5" unit="pixel"/>
-            <PARAM name="domainMax" datatype="double" value="65536.5" unit="pixel"/>
-          </GROUP>
-          <GROUP name="DET_Z-Axis">
-            <DESCRIPTION>z axis</DESCRIPTION>
-            <PARAM name="domainMin" datatype="double" value="0.0"/>
-            <PARAM name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010512XxjJ6d2Yfk" name="SkyFrame">
-        <DESCRIPTION>SKY - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="SkyFrame_CoordSpace">
-          <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
-          <GROUP ID="_0105Kby9hIzCYJPJ" name="Sky_X-Axis">
-            <DESCRIPTION>x axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="1" value="x"/>
-            <PARAM name="domainMin" datatype="double" value="0.5" unit="pixel"/>
-            <PARAM name="domainMax" datatype="double" value="65536.5" unit="pixel"/>
-          </GROUP>
-          <GROUP ID="_0105W9piipgxj8Lq" name="Sky_Y-Axis">
-            <DESCRIPTION>y axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="1" value="y"/>
-            <PARAM name="domainMin" datatype="double" value="0.5" unit="pixel"/>
-            <PARAM name="domainMax" datatype="double" value="65536.5" unit="pixel"/>
-          </GROUP>
-          <GROUP name="Sky_Z-Axis">
-            <DESCRIPTION>z axis</DESCRIPTION>
-            <PARAM name="domainMin" datatype="double" value="0.0"/>
-            <PARAM name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_01016p6qFkb1I2p7" name="ICRSFrame">
-        <DESCRIPTION>EQPOS - World spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM name="orientation" datatype="char" arraysize="4" value="ICRS"/>
-        <GROUP name="equinox">
-          <PARAM name="type" datatype="char" arraysize="1" value="J"/>
-          <PARAM name="year" datatype="double" value="2000.0"/>
-        </GROUP>
-        <GROUP name="ICRSFrame_CoordSpace">
-          <DESCRIPTION>Spherical coordinate space</DESCRIPTION>
-          <GROUP name="ICRS_R-Axis">
-            <DESCRIPTION>r axis</DESCRIPTION>
-            <PARAM name="domainMin" datatype="double" value="0"/>
-            <PARAM name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-          <GROUP ID="_01017W9piipgxj8L" name="ICRS_Theta-Axis">
-            <DESCRIPTION>ra axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="2" value="ra"/>
-            <PARAM name="domainMin" datatype="double" value="0.0" unit="deg"/>
-            <PARAM name="domainMax" datatype="double" value="360.0" unit="deg"/>
-          </GROUP>
-          <GROUP ID="_01017cwvI7yS93aI" name="ICRS_Phi-Axis">
-            <DESCRIPTION>dec axis</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="3" value="dec"/>
-            <PARAM name="domainMin" datatype="double" value="-90.0" unit="deg"/>
-            <PARAM name="domainMax" datatype="double" value="+90.0" unit="deg"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_HPykZjnKKegGJhyB" name="TargetPosition">
-        <GROUP name="coord">
-          <PARAM name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_Theta-Axis"/>
-        </GROUP>
-        <GROUP name="coord">
-          <PARAM name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_Phi-Axis"/>
-        </GROUP>
-      </GROUP>
-      <GROUP name="SparseCubeDataset">
-        <DESCRIPTION>Sparse Cube Dataset</DESCRIPTION>
-        <PARAM name="dataProductType" datatype="char" arraysize="5" ucd="meta.id" value="EVENT">
-          <DESCRIPTION>Dataset type</DESCRIPTION>
-        </PARAM>
-        <PARAM name="dataProductSubtype" datatype="char" arraysize="11" ucd="meta.id" value="Sparse Cube">
-          <DESCRIPTION>Dataset subtype</DESCRIPTION>
-        </PARAM>
-        <PARAM name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
-          <DESCRIPTION>Calibration level</DESCRIPTION>
-        </PARAM>
-        <GROUP name="Characterisation">
-          <DESCRIPTION>Characteristics of data coordinate space</DESCRIPTION>
-        </GROUP>
-        <GROUP name="Curation">
-          <DESCRIPTION>Dataset curation metadata</DESCRIPTION>
-          <PARAM name="publisherDID" datatype="char" arraysize="20" ucd="meta.ref.url;meta.curation" value="ADS/Sa.CXO#obs/00460">
-            <DESCRIPTION>Publisher specified dataset ID</DESCRIPTION>
-          </PARAM>
-          <PARAM name="version" datatype="char" arraysize="1" ucd="meta.version;meta.curation" value="5">
-            <DESCRIPTION>Publisher version of the dataset</DESCRIPTION>
-          </PARAM>
-          <PARAM name="releaseDate" datatype="char" arraysize="19" ucd="time.release" value="2014-09-16T21:33:56">
-            <DESCRIPTION>Date curated dataset last modified time.release</DESCRIPTION>
-          </PARAM>
-          <PARAM name="rights" datatype="char" arraysize="6" ucd="meta.code" value="PUBLIC">
-            <DESCRIPTION>Level of access granted</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Contact">
-            <DESCRIPTION>Contact entity for curation service</DESCRIPTION>
-            <GROUP ref="_002J6U7FbgCwoWQF" name="REF_CXCHelpdesk">
-              <DESCRIPTION>Entity associated with Contact role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Publisher">
-            <DESCRIPTION>Publisher</DESCRIPTION>
-            <PARAM name="publisherID" datatype="char" arraysize="3" ucd="meta.ref.url;meta.curation" value="TBD">
-              <DESCRIPTION>URI for VO Publisher</DESCRIPTION>
-            </PARAM>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Entity associated with Publisher role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Publication">
-            <DESCRIPTION>Reference to publication associated with the dataset</DESCRIPTION>
-            <PARAM name="refCode" datatype="char" arraysize="19" ucd="meta.bib.bibcode" value="YYYYJJJJJVVVVMPPPPA">
-              <DESCRIPTION>URL or Bibcode of the publication</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="DataID">
-          <DESCRIPTION>Dataset identification metadata</DESCRIPTION>
-          <PARAM name="title" datatype="char" arraysize="78" ucd="meta.title;meta.dataset" value="IN FLIGHT CALIBRATION OF THE HETGS EFFECTIVE AREA AND CROSS DISPERSION PROFILE">
-            <DESCRIPTION>Dataset Title</DESCRIPTION>
-          </PARAM>
-          <PARAM name="datasetID" datatype="char" arraysize="20" ucd="meta.id;meta.dataset" value="ADS/Sa.CXO#obs/00460">
-            <DESCRIPTION>IVOA Dataset Identifier</DESCRIPTION>
-          </PARAM>
-          <PARAM name="creatorDID" datatype="char" arraysize="20" ucd="meta.id" value="ADS/Sa.CXO#obs/00460">
-            <DESCRIPTION>Creator defined Dataset Identifier</DESCRIPTION>
-          </PARAM>
-          <PARAM name="version" datatype="char" arraysize="1" ucd="meta.version;meta.dataset" value="5">
-            <DESCRIPTION>Dataset version assigned by creator</DESCRIPTION>
-          </PARAM>
-          <PARAM name="date" datatype="char" arraysize="19" ucd="time.epoch;meta.dataset" value="2014-09-16T21:33:56">
-            <DESCRIPTION>Data processing/creation date</DESCRIPTION>
-          </PARAM>
-          <PARAM name="creationType" datatype="char" arraysize="8" value="ARCHIVAL">
-            <DESCRIPTION>Dataset creation type</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Collection">
-            <DESCRIPTION>Collection to which the dataset is a member</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="7" value="Chandra">
-              <DESCRIPTION>Collection name</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-          <GROUP name="Contributor">
-            <DESCRIPTION>Contributor</DESCRIPTION>
-            <PARAM name="acknowledgment" datatype="char" arraysize="129" value="CIAO: Chandra's data analysis system (ADS, PS); Fruscione et al. 2006, SPIE Proc. 6270, 62701V, D.R. Silvia and R.E. Doxsey, eds.">
-              <DESCRIPTION>Acknowledgment expression for the contributor</DESCRIPTION>
-            </PARAM>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Individual associated with Contributor role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Creator">
-            <DESCRIPTION>Institution or entity which created the dataset</DESCRIPTION>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Individual associated with the Creator role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Derived">
-          <DESCRIPTION>Derived metadata</DESCRIPTION>
-          <GROUP name="ONTIME">
-            <DESCRIPTION>property derived from analysis of data content</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="8" value="EXPOSURE">
-              <DESCRIPTION>Total exposure time, with all known corrections</DESCRIPTION>
-            </PARAM>
-            <PARAM name="value" datatype="double" value="39930.0463526">
-              <DESCRIPTION>value of derived property</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="ObsConfig">
-          <DESCRIPTION>ObsConfig Object</DESCRIPTION>
-          <PARAM name="bandpass" datatype="char" arraysize="4" ucd="instr.bandpass" value="XRAY">
-            <DESCRIPTION>General regime in spectral domain</DESCRIPTION>
-          </PARAM>
-          <PARAM name="datasource" datatype="char" arraysize="7" value="POINTED">
-            <DESCRIPTION>Original source/type of data</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Facility">
-            <DESCRIPTION>Metadata for the facility performing the observation</DESCRIPTION>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Organization responsible for performing the observation</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Instrument">
-            <DESCRIPTION>Metadata for the Instrument which created the data</DESCRIPTION>
-            <PARAM name="name" datatype="char" arraysize="7" ucd="meta.id;instr" value="CHANDRA">
-              <DESCRIPTION>Instrument ID</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Proposal">
-          <DESCRIPTION>Proposal Object</DESCRIPTION>
-          <PARAM name="identifier" datatype="char" arraysize="8" ucd="meta.id;obs.proposal" value="12345678">
-            <DESCRIPTION>Proposal ID</DESCRIPTION>
-          </PARAM>
-        </GROUP>
-        <GROUP name="AstroTarget">
-          <DESCRIPTION>AstroTarget Object</DESCRIPTION>
-          <PARAM name="name" datatype="char" arraysize="6" ucd="meta.id;src" value="3C 273">
-            <DESCRIPTION>Target name</DESCRIPTION>
-          </PARAM>
-          <PARAM name="description" datatype="char" arraysize="3" ucd="meta.note;src" value="TBD">
-            <DESCRIPTION>Target descriptive text</DESCRIPTION>
-          </PARAM>
-          <PARAM name="objectClass" datatype="char" arraysize="3" ucd="src.class" value="TBD">
-            <DESCRIPTION>Target or object class</DESCRIPTION>
-          </PARAM>
-          <PARAM name="spectralClass" datatype="char" arraysize="3" ucd="src.spType" value="TBD">
-            <DESCRIPTION>Object spectral class</DESCRIPTION>
-          </PARAM>
-          <PARAM name="redshift" datatype="double" ucd="src.redshift" value="NaN">
-            <DESCRIPTION>Target redshift</DESCRIPTION>
-          </PARAM>
-          <PARAM name="varAmpl" datatype="double" value="NaN">
-            <DESCRIPTION>Target variability amplitude - typical</DESCRIPTION>
-          </PARAM>
-          <GROUP ref="_HPykZjnKKegGJhyB" name="REF_TargetPosition">
-            <DESCRIPTION>Target location (eg: RA, DEC)</DESCRIPTION>
-          </GROUP>
-        </GROUP>
-        <GROUP ref="_6hrehomO3bIilaTo" name="REF_CoordSys-Phys">
-          <DESCRIPTION>Global coordinate systems (Physical)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A18RNKjFBdI7kMap" name="REF_CoordSys-World">
-          <DESCRIPTION>Global coordinate systems (World)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A9OKA8Pw7UvuTGbF" name="REF_SparseCube">
-          <DESCRIPTION>Sparse Cube point data</DESCRIPTION>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_A9OKA8Pw7UvuTGbF" name="SparseCube">
-        <GROUP ID="_6hrehomO3bIilaTo" name="CoordSys-Phys">
-          <DESCRIPTION>Physical Coordinate System</DESCRIPTION>
-          <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame"/>
-          <GROUP ref="_0117pYWsEJmSbhJP" name="REF_TimeFrame"/>
-          <GROUP ref="_01390NTXcYmRii44" name="REF_PIFrame"/>
-        </GROUP>
-        <GROUP ID="_A18RNKjFBdI7kMap" name="CoordSys-World">
-          <DESCRIPTION>World Coordinate System</DESCRIPTION>
-          <GROUP ref="_01016p6qFkb1I2p7" name="REF_ICRSFrame"/>
-          <GROUP ref="_0117pYWsEJmSbhJP" name="REF_TimeFrame"/>
-          <GROUP ref="_01390NTXcYmRii44" name="REF_PIFrame"/>
-        </GROUP>
-        <GROUP name="Mappings">
-          <DESCRIPTION>Frame Transforms</DESCRIPTION>
-          <GROUP name="SKY2EQPOS">
-            <DESCRIPTION>Sky-to-EQPOS Transform</DESCRIPTION>
-            <GROUP name="SKY2EQPOS_Projection">
-              <DESCRIPTION>WCS Projection instance</DESCRIPTION>
-              <PARAM name="algorithm" datatype="char" arraysize="3" value="TAN">
-                <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
-              </PARAM>
-              <GROUP name="SKY2EQPOS_AXIS1">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM name="nativeRefValue" datatype="double" value="32768.5">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="targetRefValue" datatype="double" value="187.280152947">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="scale" datatype="double" value="-3.66111111111e-05">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-              <GROUP name="SKY2EQPOS_AXIS2">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM name="nativeRefValue" datatype="double" value="32768.5">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="targetRefValue" datatype="double" value="2.05700100372">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM name="scale" datatype="double" value="3.66111111111e-05">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-            </GROUP>
-            <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame">
-              <DESCRIPTION>Originating Frame (sky)</DESCRIPTION>
-            </GROUP>
-            <GROUP ref="_01016p6qFkb1I2p7" name="REF_ICRSFrame">
-              <DESCRIPTION>Resulting Frame (eqpos)</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="NDPoint">
-          <GROUP name="TimeDataAxis">
-            <DESCRIPTION>Time Domain data axis</DESCRIPTION>
-            <GROUP name="TimeData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-time"/>
-                <GROUP ref="_0118WLLnSEBj0p46" name="REF_Time_CoordAxis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="SKYDataAxis">
-            <DESCRIPTION>Spatial Domain data axis - Sky</DESCRIPTION>
-            <GROUP name="SKYData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-x"/>
-                <GROUP ref="_0105Kby9hIzCYJPJ" name="REF_Sky_X-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-y"/>
-                <GROUP ref="_0105W9piipgxj8Lq" name="REF_Sky_Y-Axis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="EQPOSDataAxis">
-            <DESCRIPTION>Spatial Domain data axis - EQPOS</DESCRIPTION>
-            <GROUP name="EQPOSData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-ra"/>
-                <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_Theta-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-dec"/>
-                <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_Phi-Axis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="PHADataAxis">
-            <DESCRIPTION>Spectral Domain data axis - PHA</DESCRIPTION>
-            <GROUP name="PHAData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-pha"/>
-                <GROUP ref="_0129ge70cAi4MErU" name="REF_PHA_CoordAxis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-      </GROUP>
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM name="name" datatype="char" arraysize="24" value="The Chandra X-Ray Center"/>
+      <PARAM name="address" datatype="char" arraysize="41" value="60 Garden Street, Cambridge, MA 02138 USA"/>
+      <PARAM name="email" datatype="char" arraysize="27" ucd="meta.ref.url;meta.email" value="cxcweb at head.cfa.harvard.edu"/>
+      <PARAM name="phone" datatype="char" arraysize="12" value="617-496-7941"/>
+      <PARAM name="logo" datatype="char" arraysize="52" ucd="meta.ref.url" value="http://chandra.si.edu/graphics/top/icon_cxc_foot.jpg"/>
+      <PARAM name="name" datatype="char" arraysize="19" value="CXC HelpDesk System"/>
+      <PARAM name="address" datatype="char" arraysize="3" value="N/A"/>
+      <PARAM name="email" datatype="char" arraysize="28" ucd="meta.ref.url;meta.email" value="cxchelp at head.cfa.harvard.edu"/>
+      <PARAM name="phone" datatype="char" arraysize="3" value="N/A"/>
+      <PARAM name="timescale" datatype="char" arraysize="2" value="TT"/>
+      <PARAM name="value" datatype="double" value="50814.0"/>
+      <PARAM name="name" datatype="char" arraysize="4" value="time"/>
+      <PARAM name="domainMin" datatype="double" value="-Inf"/>
+      <PARAM name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM name="name" datatype="char" arraysize="3" value="pha"/>
+      <PARAM name="domainMin" datatype="double" value="0" unit="chan"/>
+      <PARAM name="domainMax" datatype="double" value="255" unit="chan"/>
+      <PARAM name="name" datatype="char" arraysize="2" value="pi"/>
+      <PARAM name="domainMin" datatype="double" value="0" unit="chan"/>
+      <PARAM name="domainMax" datatype="double" value="1023" unit="chan"/>
+      <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM name="name" datatype="char" arraysize="5" value="chipx"/>
+      <PARAM name="domainMin" datatype="double" value="1" unit="pixel"/>
+      <PARAM name="domainMax" datatype="double" value="4096" unit="pixel"/>
+      <PARAM name="name" datatype="char" arraysize="5" value="chipy"/>
+      <PARAM name="domainMin" datatype="double" value="1" unit="pixel"/>
+      <PARAM name="domainMax" datatype="double" value="16456" unit="pixel"/>
+      <PARAM name="name" datatype="char" arraysize="6" value="ccd_id"/>
+      <PARAM name="domainMin" datatype="int" value="1"/>
+      <PARAM name="domainMax" datatype="int" value="3"/>
+      <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM name="name" datatype="char" arraysize="5" value="tdetx"/>
+      <PARAM name="domainMin" datatype="double" value="1" unit="pixel"/>
+      <PARAM name="domainMax" datatype="double" value="4096" unit="pixel"/>
+      <PARAM name="name" datatype="char" arraysize="5" value="tdety"/>
+      <PARAM name="domainMin" datatype="double" value="1" unit="pixel"/>
+      <PARAM name="domainMax" datatype="double" value="49368" unit="pixel"/>
+      <PARAM name="domainMin" datatype="double" value="0.0"/>
+      <PARAM name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM name="name" datatype="char" arraysize="4" value="detx"/>
+      <PARAM name="domainMin" datatype="double" value="0.5" unit="pixel"/>
+      <PARAM name="domainMax" datatype="double" value="65536.5" unit="pixel"/>
+      <PARAM name="name" datatype="char" arraysize="4" value="dety"/>
+      <PARAM name="domainMin" datatype="double" value="0.5" unit="pixel"/>
+      <PARAM name="domainMax" datatype="double" value="65536.5" unit="pixel"/>
+      <PARAM name="domainMin" datatype="double" value="0.0"/>
+      <PARAM name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM name="name" datatype="char" arraysize="1" value="x"/>
+      <PARAM name="domainMin" datatype="double" value="0.5" unit="pixel"/>
+      <PARAM name="domainMax" datatype="double" value="65536.5" unit="pixel"/>
+      <PARAM name="name" datatype="char" arraysize="1" value="y"/>
+      <PARAM name="domainMin" datatype="double" value="0.5" unit="pixel"/>
+      <PARAM name="domainMax" datatype="double" value="65536.5" unit="pixel"/>
+      <PARAM name="domainMin" datatype="double" value="0.0"/>
+      <PARAM name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM name="orientation" datatype="char" arraysize="4" value="ICRS"/>
+      <PARAM name="type" datatype="char" arraysize="1" value="J"/>
+      <PARAM name="year" datatype="double" value="2000.0"/>
+      <PARAM name="domainMin" datatype="double" value="0"/>
+      <PARAM name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM name="name" datatype="char" arraysize="2" value="ra"/>
+      <PARAM name="domainMin" datatype="double" value="0.0" unit="deg"/>
+      <PARAM name="domainMax" datatype="double" value="360.0" unit="deg"/>
+      <PARAM name="name" datatype="char" arraysize="3" value="dec"/>
+      <PARAM name="domainMin" datatype="double" value="-90.0" unit="deg"/>
+      <PARAM name="domainMax" datatype="double" value="+90.0" unit="deg"/>
+      <PARAM name="loc" datatype="double" value="NaN"/>
+      <PARAM name="loc" datatype="double" value="NaN"/>
+      <PARAM name="dataProductType" datatype="char" arraysize="5" ucd="meta.id" value="EVENT">
+        <DESCRIPTION>Dataset type</DESCRIPTION>
+      </PARAM>
+      <PARAM name="dataProductSubtype" datatype="char" arraysize="11" ucd="meta.id" value="Sparse Cube">
+        <DESCRIPTION>Dataset subtype</DESCRIPTION>
+      </PARAM>
+      <PARAM name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
+        <DESCRIPTION>Calibration level</DESCRIPTION>
+      </PARAM>
+      <PARAM name="publisherDID" datatype="char" arraysize="20" ucd="meta.ref.url;meta.curation" value="ADS/Sa.CXO#obs/00460">
+        <DESCRIPTION>Publisher specified dataset ID</DESCRIPTION>
+      </PARAM>
+      <PARAM name="version" datatype="char" arraysize="1" ucd="meta.version;meta.curation" value="5">
+        <DESCRIPTION>Publisher version of the dataset</DESCRIPTION>
+      </PARAM>
+      <PARAM name="releaseDate" datatype="char" arraysize="19" ucd="time.release" value="2014-09-16T21:33:56">
+        <DESCRIPTION>Date curated dataset last modified time.release</DESCRIPTION>
+      </PARAM>
+      <PARAM name="rights" datatype="char" arraysize="6" ucd="meta.code" value="PUBLIC">
+        <DESCRIPTION>Level of access granted</DESCRIPTION>
+      </PARAM>
+      <PARAM name="publisherID" datatype="char" arraysize="3" ucd="meta.ref.url;meta.curation" value="TBD">
+        <DESCRIPTION>URI for VO Publisher</DESCRIPTION>
+      </PARAM>
+      <PARAM name="refCode" datatype="char" arraysize="19" ucd="meta.bib.bibcode" value="YYYYJJJJJVVVVMPPPPA">
+        <DESCRIPTION>URL or Bibcode of the publication</DESCRIPTION>
+      </PARAM>
+      <PARAM name="title" datatype="char" arraysize="78" ucd="meta.title;meta.dataset" value="IN FLIGHT CALIBRATION OF THE HETGS EFFECTIVE AREA AND CROSS DISPERSION PROFILE">
+        <DESCRIPTION>Dataset Title</DESCRIPTION>
+      </PARAM>
+      <PARAM name="datasetID" datatype="char" arraysize="20" ucd="meta.id;meta.dataset" value="ADS/Sa.CXO#obs/00460">
+        <DESCRIPTION>IVOA Dataset Identifier</DESCRIPTION>
+      </PARAM>
+      <PARAM name="creatorDID" datatype="char" arraysize="20" ucd="meta.id" value="ADS/Sa.CXO#obs/00460">
+        <DESCRIPTION>Creator defined Dataset Identifier</DESCRIPTION>
+      </PARAM>
+      <PARAM name="version" datatype="char" arraysize="1" ucd="meta.version;meta.dataset" value="5">
+        <DESCRIPTION>Dataset version assigned by creator</DESCRIPTION>
+      </PARAM>
+      <PARAM name="date" datatype="char" arraysize="19" ucd="time.epoch;meta.dataset" value="2014-09-16T21:33:56">
+        <DESCRIPTION>Data processing/creation date</DESCRIPTION>
+      </PARAM>
+      <PARAM name="creationType" datatype="char" arraysize="8" value="ARCHIVAL">
+        <DESCRIPTION>Dataset creation type</DESCRIPTION>
+      </PARAM>
+      <PARAM name="name" datatype="char" arraysize="7" value="Chandra">
+        <DESCRIPTION>Collection name</DESCRIPTION>
+      </PARAM>
+      <PARAM name="acknowledgment" datatype="char" arraysize="129" value="CIAO: Chandra's data analysis system (ADS, PS); Fruscione et al. 2006, SPIE Proc. 6270, 62701V, D.R. Silvia and R.E. Doxsey, eds.">
+        <DESCRIPTION>Acknowledgment expression for the contributor</DESCRIPTION>
+      </PARAM>
+      <PARAM name="name" datatype="char" arraysize="8" value="EXPOSURE">
+        <DESCRIPTION>Total exposure time, with all known corrections</DESCRIPTION>
+      </PARAM>
+      <PARAM name="value" datatype="double" value="39930.0463526">
+        <DESCRIPTION>value of derived property</DESCRIPTION>
+      </PARAM>
+      <PARAM name="bandpass" datatype="char" arraysize="4" ucd="instr.bandpass" value="XRAY">
+        <DESCRIPTION>General regime in spectral domain</DESCRIPTION>
+      </PARAM>
+      <PARAM name="datasource" datatype="char" arraysize="7" value="POINTED">
+        <DESCRIPTION>Original source/type of data</DESCRIPTION>
+      </PARAM>
+      <PARAM name="name" datatype="char" arraysize="7" ucd="meta.id;instr" value="CHANDRA">
+        <DESCRIPTION>Instrument ID</DESCRIPTION>
+      </PARAM>
+      <PARAM name="identifier" datatype="char" arraysize="8" ucd="meta.id;obs.proposal" value="12345678">
+        <DESCRIPTION>Proposal ID</DESCRIPTION>
+      </PARAM>
+      <PARAM name="name" datatype="char" arraysize="6" ucd="meta.id;src" value="3C 273">
+        <DESCRIPTION>Target name</DESCRIPTION>
+      </PARAM>
+      <PARAM name="description" datatype="char" arraysize="3" ucd="meta.note;src" value="TBD">
+        <DESCRIPTION>Target descriptive text</DESCRIPTION>
+      </PARAM>
+      <PARAM name="objectClass" datatype="char" arraysize="3" ucd="src.class" value="TBD">
+        <DESCRIPTION>Target or object class</DESCRIPTION>
+      </PARAM>
+      <PARAM name="spectralClass" datatype="char" arraysize="3" ucd="src.spType" value="TBD">
+        <DESCRIPTION>Object spectral class</DESCRIPTION>
+      </PARAM>
+      <PARAM name="redshift" datatype="double" ucd="src.redshift" value="NaN">
+        <DESCRIPTION>Target redshift</DESCRIPTION>
+      </PARAM>
+      <PARAM name="varAmpl" datatype="double" value="NaN">
+        <DESCRIPTION>Target variability amplitude - typical</DESCRIPTION>
+      </PARAM>
+      <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <PARAM name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <PARAM name="algorithm" datatype="char" arraysize="3" value="TAN">
+        <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
+      </PARAM>
+      <PARAM name="nativeRefValue" datatype="double" value="32768.5">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="targetRefValue" datatype="double" value="187.280152947">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="scale" datatype="double" value="-3.66111111111e-05">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="nativeRefValue" datatype="double" value="32768.5">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="targetRefValue" datatype="double" value="2.05700100372">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM name="scale" datatype="double" value="3.66111111111e-05">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
       <!-- Data FIELDs -->
-      <FIELD ID="_col-time" name="time" datatype="double"/>
-      <FIELD ID="_col-x" name="x" datatype="double"/>
-      <FIELD ID="_col-y" name="y" datatype="double"/>
-      <FIELD ID="_col-ra" name="ra" datatype="double"/>
-      <FIELD ID="_col-dec" name="dec" datatype="double"/>
-      <FIELD ID="_col-pha" name="pha" datatype="double"/>
+      <FIELD ID="_col-time" name="time" datatype="double" unit="s"/>
+      <FIELD ID="_col-x" name="x" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-y" name="y" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-ra" name="ra" datatype="double" unit="deg"/>
+      <FIELD ID="_col-dec" name="dec" datatype="double" unit="deg"/>
+      <FIELD ID="_col-pha" name="pha" datatype="double" unit="chan"/>
       <DATA>
         <FITS extnum="1">
           <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/chandra_grat_events.fits"/>

Modified: trunk/projects/dm/CubeDM-1.0/examples/chandra_grat_events_annotated_byref.vot
==============================================================================
--- trunk/projects/dm/CubeDM-1.0/examples/chandra_grat_events_annotated_byref.vot	Sat Apr 29 00:29:07 2017	(r3993)
+++ trunk/projects/dm/CubeDM-1.0/examples/chandra_grat_events_annotated_byref.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -6,10 +6,6 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
-      <NAME>coordsys</NAME>
-      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml</URL>
-    </MODEL>
-    <MODEL>
       <NAME>cube</NAME>
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml</URL>
     </MODEL>
@@ -22,11 +18,15 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
       <NAME>trans</NAME>
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/trans/STCTrans-2.0.vo-dml.xml</URL>
     </MODEL>
     <GLOBALS>
-      <INSTANCE ID="_001J6U7FbgCwoWQF2" dmtype="ds:party.Organization">
+      <INSTANCE ID="_001J6U7FbgCwoWQF" dmtype="ds:party.Organization">
         <ATTRIBUTE dmrole="ds:party.Party.name">
           <CONSTANT ref="_001LrAjgQQfUzcfv" dmtype="ivoa:string"/>
         </ATTRIBUTE>
@@ -43,7 +43,7 @@
           <CONSTANT ref="_001gfnUmg1OEVIwq" dmtype="ivoa:anyURI"/>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE ID="_002J6U7FbgCwoWQF2" dmtype="ds:party.Individual">
+      <INSTANCE ID="_002J6U7FbgCwoWQF" dmtype="ds:party.Individual">
         <ATTRIBUTE dmrole="ds:party.Party.name">
           <CONSTANT ref="_002LrAjgQQfUzcfv" dmtype="ivoa:string"/>
         </ATTRIBUTE>
@@ -57,35 +57,28 @@
           <CONSTANT ref="_002dDUBXHoOSB9wX" dmtype="ivoa:string"/>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE ID="_0117pYWsEJmSbhJP2" dmtype="coordsys:domain.temporal.TimeFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeFrame.timescale">
-          <CONSTANT ref="_0117wfKnTYv8NLOK" dmtype="coordsys:domain.temporal.TimeScale"/>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeFrame.refPosition">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_0118TZnYKkxxCzyE" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeFrame.offset">
-          <INSTANCE dmtype="coordsys:domain.temporal.TimeOffset">
-            <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeOffset.loc">
+      <INSTANCE ID="_0117pYWsEJmSbhJP" dmtype="coords:domain.temporal.TimeFrame">
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.timescale">
+          <CONSTANT ref="_0117wfKnTYv8NLOK" dmtype="coords:domain.temporal.TimeScale"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.time0">
+          <INSTANCE dmtype="coords:domain.temporal.TimeOffset">
+            <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
               <CONSTANT ref="_0118HEAjt4qRFTI5" dmtype="ivoa:RealQuantity"/>
             </ATTRIBUTE>
           </INSTANCE>
         </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.temporal.TimeFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.temporal.CoordSpace1D">
-            <COMPOSITION dmrole="coordsys:domain.temporal.CoordSpace.axis"> 
-              <INSTANCE ID="_0118WLLnSEBj0p462" dmtype="coordsys:domain.temporal.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.temporal.CoordAxis.name">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.temporal.TimeSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0118WLLnSEBj0p46" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0118cF2Rm82EU45n" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.temporal.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0118cF2Rm82EU45p" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.temporal.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0118ceJK1JFBuxCY" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -93,25 +86,18 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_01290NTXcYmRii442" dmtype="coordsys:domain.spectral.SpectralFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralFrame.refPosition">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_0129bEaqPQiuXGGP" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spectral.SpectralFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spectral.CoordSpace1D">
-            <COMPOSITION dmrole="coordsys:domain.spectral.CoordSpace.axis"> 
-              <INSTANCE ID="_0129ge70cAi4MErU2" dmtype="coordsys:domain.spectral.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.name">
+      <INSTANCE dmtype="coords:domain.spectral.SpectralFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spectral.SpectralSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0129ge70cAi4MErU" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0129hu1SarMbOnaT" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0129hu1SarMbOnaU" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0129o6A8iklnaxZm" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -119,25 +105,18 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_01390NTXcYmRii442" dmtype="coordsys:domain.spectral.SpectralFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralFrame.refPosition">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_0139bEaqPQiuXGGP" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spectral.SpectralFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spectral.CoordSpace1D">
-            <COMPOSITION dmrole="coordsys:domain.spectral.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spectral.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.name">
+      <INSTANCE ID="_01390NTXcYmRii44" dmtype="coords:domain.spectral.SpectralFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spectral.SpectralSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0139hu1SarMbOnaT" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0139hu1SarMbOnaU" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spectral.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0139o6A8iklnaxZm" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -145,50 +124,43 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010212XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_0102GrdyEo0SN7Ds" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <CONSTANT ref="_01021jiJzYdXI6UP" dmtype="coordsys:domain.spatial.StdRefFrame"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <CONSTANT ref="_01021jiJzYdXI6UP" dmtype="coords:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0102OyyH8HFLPhaO" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0102OyyH8HFLPhbO" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0102TEQM98JBAYHu" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0102bl4ryZpLwCUc" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0102bl4ryZpLwCUd" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0102bx0oGeMSniEK" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0102e3zBfvt1YxKm" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0102e3zBfvt1YxKn" dmtype="ivoa:IntegerQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0102f0jRCn9ZYWEB" dmtype="ivoa:IntegerQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -196,47 +168,40 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010312XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_0103GrdyEo0SN7Ds" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <CONSTANT ref="_01031jiJzYdXI6UP" dmtype="coordsys:domain.spatial.StdRefFrame"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <CONSTANT ref="_01031jiJzYdXI6UP" dmtype="coords:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0103OyyH8HFLPhaO" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0103OyyH8HFLPhbO" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0103TEQM98JBAYHu" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0103bl4ryZpLwCUc" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0103bl4ryZpLwCUd" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0103bx0oGeMSniEK" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0103e3zBfvt1YxKn" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0103f0jRCn9ZYWEB" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -244,47 +209,40 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010412XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_0104GrdyEo0SN7Ds" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <CONSTANT ref="_01041jiJzYdXI6UP" dmtype="coordsys:domain.spatial.StdRefFrame"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <CONSTANT ref="_01041jiJzYdXI6UP" dmtype="coords:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0104OyyH8HFLPhaO" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0104OyyH8HFLPhbO" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0104TEQM98JBAYHu" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0104bl4ryZpLwCUc" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0104bl4ryZpLwCUd" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0104bx0oGeMSniEK" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0104e3zBfvt1YxKn" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0104f0jRCn9ZYWEB" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -292,47 +250,40 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_010512XxjJ6d2Yfk2" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_0105GrdyEo0SN7Ds" dmtype="coordsys:domain.spatial.StdRefPosition"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <CONSTANT ref="_01051jiJzYdXI6UP" dmtype="coordsys:domain.spatial.StdRefFrame"/>
-        </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Cartesian">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE ID="_0105Kby9hIzCYJPJ2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+      <INSTANCE ID="_010512XxjJ6d2Yfk" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <CONSTANT ref="_01051jiJzYdXI6UP" dmtype="coords:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Cartesian">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0105Kby9hIzCYJPJ" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0105OyyH8HFLPhaO" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0105OyyH8HFLPhbO" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0105TEQM98JBAYHu" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_0105W9piipgxj8Lq2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_0105W9piipgxj8Lq" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_0105bl4ryZpLwCUc" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0105bl4ryZpLwCUd" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0105bx0oGeMSniEK" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_0105e3zBfvt1YxKn" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_0105f0jRCn9ZYWEB" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -340,57 +291,50 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_01016p6qFkb1I2p72" dmtype="coordsys:domain.spatial.SpaceFrame">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <INSTANCE dmtype="coordsys:domain.spatial.StdSpatialLocation">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.StdSpatialLocation.coord">
-              <CONSTANT ref="_010174BLUAVSMDVw" dmtype="coordsys:domain.spatial.StdRefPosition"/>
+      <INSTANCE ID="_01016p6qFkb1I2p7" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <CONSTANT ref="_01016u2XxjJ6d2Yf" dmtype="coords:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.equinox">
+          <INSTANCE dmtype="coords:domain.spatial.Epoch">
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.type">
+              <CONSTANT ref="_01017fNEHUi0m9rW" dmtype="coords:domain.spatial.EpochType"/>
             </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.orientation">
-          <CONSTANT ref="_01016u2XxjJ6d2Yf" dmtype="coordsys:domain.spatial.StdRefFrame"/>
-        </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.equinox">
-          <INSTANCE dmtype="coordsys:domain.spatial.Epoch">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.Epoch.type">
-              <CONSTANT ref="_01017fNEHUi0m9rW" dmtype="coordsys:domain.spatial.EpochType"/>
-            </ATTRIBUTE>
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.Epoch.year">
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.year">
               <CONSTANT ref="_01017foOjpZJkO0E" dmtype="ivoa:real"/>
             </ATTRIBUTE>
           </INSTANCE>
         </ATTRIBUTE>
-        <COMPOSITION dmrole="coordsys:domain.spatial.SpaceFrame.coordSpace"> 
-          <INSTANCE dmtype="coordsys:domain.spatial.Spherical">
-            <COMPOSITION dmrole="coordsys:domain.spatial.CoordSpace.axis"> 
-              <INSTANCE dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Spherical">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_01017OyyH8HFLPhb" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_01017TEQM98JBAYH" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_01017W9piipgxj8L2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_01017W9piipgxj8L" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_01017bl4ryZpLwCT" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_01017bl4ryZpLwCU" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_01017bx0oGeMSniE" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
-              <INSTANCE ID="_01017cwvI7yS93aI2" dmtype="coordsys:domain.spatial.CoordAxis">
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.name">
+              <INSTANCE ID="_01017cwvI7yS93aI" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
                   <CONSTANT ref="_01017e3zBfvt1YxJ" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMin">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
                   <CONSTANT ref="_01017e3zBfvt1YxK" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
-                <ATTRIBUTE dmrole="coordsys:domain.spatial.CoordAxis.domainMax">
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
                   <CONSTANT ref="_01017f0jRCn9ZYWE" dmtype="ivoa:RealQuantity"/>
                 </ATTRIBUTE>
               </INSTANCE>
@@ -398,27 +342,31 @@
           </INSTANCE>
         </COMPOSITION> 
       </INSTANCE>
-      <INSTANCE ID="_HPykZjnKKegGJhyB2" dmtype="coords:domain.spatial.Position2D">
-        <ATTRIBUTE dmrole="coords:domain.spatial.Position2D.coord">
-          <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-              <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
-            </ATTRIBUTE>
-            <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-              <IDREF>_01017W9piipgxj8L2</IDREF>
-            </REFERENCE>
-          </INSTANCE>
-          <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-            <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-              <CONSTANT ref="_HwTBlKFGp2MWVh1Q" dmtype="ivoa:RealQuantity"/>
+      <INSTANCE ID="_HPykZjnKKegGJhyB" dmtype="meas:Position2D">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+            <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_01017W9piipgxj8L</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <CONSTANT ref="_HwTBlKFGp2MWVh1Q" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_01017cwvI7yS93aI</IDREF>
+                </REFERENCE>
+              </INSTANCE>
             </ATTRIBUTE>
-            <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-              <IDREF>_01017cwvI7yS93aI2</IDREF>
-            </REFERENCE>
           </INSTANCE>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE dmtype="cube:SparseCubeDataset">
+      <INSTANCE dmtype="ds:experiment.ObsDataset">
         <ATTRIBUTE dmrole="ds:dataset.Dataset.dataProductType">
           <CONSTANT ref="_07Yrfb1KUNZfOEK8" dmtype="ds:dataset.DataProductType"/>
         </ATTRIBUTE>
@@ -428,10 +376,6 @@
         <ATTRIBUTE dmrole="ds:experiment.ObsDataset.calibLevel">
           <CONSTANT ref="_0GQQpjxvwn9XD0e1" dmtype="ivoa:integer"/>
         </ATTRIBUTE>
-        <COMPOSITION dmrole="ds:experiment.ObsDataset.characterisation"> 
-          <INSTANCE dmtype="ds:experiment.Characterisation">
-          </INSTANCE>
-        </COMPOSITION> 
         <COMPOSITION dmrole="ds:dataset.Dataset.curation"> 
           <INSTANCE dmtype="ds:dataset.Curation">
             <ATTRIBUTE dmrole="ds:dataset.Curation.publisherDID">
@@ -449,7 +393,7 @@
             <COMPOSITION dmrole="ds:dataset.Curation.contact"> 
               <INSTANCE dmtype="ds:dataset.Contact">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_002J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_002J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -459,7 +403,7 @@
                   <CONSTANT ref="_2FyzrxBRroXJYrrJ" dmtype="ivoa:anyURI"/>
                 </ATTRIBUTE>
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -505,14 +449,14 @@
                   <CONSTANT ref="_41oqw2x4Vn7JMqHy" dmtype="ivoa:string"/>
                 </ATTRIBUTE>
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
             <COMPOSITION dmrole="ds:dataset.DataID.creator"> 
               <INSTANCE dmtype="ds:dataset.Creator">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -543,7 +487,7 @@
             <COMPOSITION dmrole="ds:experiment.ObsConfig.facility"> 
               <INSTANCE dmtype="ds:experiment.Facility">
                 <REFERENCE dmrole="ds:party.Role.party">
-                  <IDREF>_001J6U7FbgCwoWQF2</IDREF>
+                  <IDREF>_001J6U7FbgCwoWQF</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -584,40 +528,47 @@
               <CONSTANT ref="_1JakggUBNfow3eQQ" dmtype="ivoa:real"/>
             </ATTRIBUTE>
             <REFERENCE dmrole="ds:experiment.BaseTarget.position">
-              <IDREF>_HPykZjnKKegGJhyB2</IDREF>
+              <IDREF>_HPykZjnKKegGJhyB</IDREF>
             </REFERENCE>
           </INSTANCE>
         </COMPOSITION> 
-        <REFERENCE dmrole="ds:experiment.ObsDataset.coordSys">
-          <IDREF>_6hrehomO3bIilaTo2</IDREF>
-          <IDREF>_A18RNKjFBdI7kMap2</IDREF>
-        </REFERENCE>
-        <REFERENCE dmrole="cube:SparseCubeDataset.cube">
-          <IDREF>_A9OKA8Pw7UvuTGbF2</IDREF>
-        </REFERENCE>
       </INSTANCE>
-      <INSTANCE ID="_A9OKA8Pw7UvuTGbF2" dmtype="cube:SparseCube">
+      <INSTANCE dmtype="cube:SparseCube">
         <COMPOSITION dmrole="cube:DataProduct.coordSys"> 
-          <INSTANCE ID="_6hrehomO3bIilaTo2" dmtype="cube:CoordSys">
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spaceFrame">
-              <IDREF>_010512XxjJ6d2Yfk2</IDREF>
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <CONSTANT ref="_010074BLUAVSMDVw" dmtype="coords:domain.spatial.StdRefPosition"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.timeFrame">
+              <IDREF>_0117pYWsEJmSbhJP</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.timeFrame">
-              <IDREF>_0117pYWsEJmSbhJP2</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_010512XxjJ6d2Yfk</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spectralFrame">
-              <IDREF>_01390NTXcYmRii442</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spectralFrame">
+              <IDREF>_01390NTXcYmRii44</IDREF>
             </REFERENCE>
           </INSTANCE>
-          <INSTANCE ID="_A18RNKjFBdI7kMap2" dmtype="cube:CoordSys">
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spaceFrame">
-              <IDREF>_01016p6qFkb1I2p72</IDREF>
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <CONSTANT ref="_010074BLUAVSMDVw" dmtype="coords:domain.spatial.StdRefPosition"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.timeFrame">
+              <IDREF>_0117pYWsEJmSbhJP</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.timeFrame">
-              <IDREF>_0117pYWsEJmSbhJP2</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_01016p6qFkb1I2p7</IDREF>
             </REFERENCE>
-            <REFERENCE dmrole="coordsys:AstroCoordSystem.spectralFrame">
-              <IDREF>_01390NTXcYmRii442</IDREF>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spectralFrame">
+              <IDREF>_01390NTXcYmRii44</IDREF>
             </REFERENCE>
           </INSTANCE>
         </COMPOSITION> 
@@ -657,10 +608,10 @@
                   </INSTANCE>
                 </COMPOSITION> 
                 <REFERENCE dmrole="trans:FrameTransform.nativeFrame">
-                  <IDREF>_010512XxjJ6d2Yfk2</IDREF>
+                  <IDREF>_010512XxjJ6d2Yfk</IDREF>
                 </REFERENCE>
                 <REFERENCE dmrole="trans:FrameTransform.targetFrame">
-                  <IDREF>_01016p6qFkb1I2p72</IDREF>
+                  <IDREF>_01016p6qFkb1I2p7</IDREF>
                 </REFERENCE>
               </INSTANCE>
             </COMPOSITION> 
@@ -673,81 +624,101 @@
     </GLOBALS>
     <TEMPLATES tableref="_table1">
         <INSTANCE ID="_AK9CaKnrQwqiiyvn3" dmtype="cube:NDPoint">
-          <COMPOSITION dmrole="cube:NDPoint.axis"> 
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords.domain.temporal.Time">
-                  <ATTRIBUTE dmrole="coords:domain.temporal.Time.coord">
-                    <INSTANCE dmtype="coordsys:domain.temporal.TimeCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.temporal.TimeOffset.loc">
+          <COMPOSITION dmrole="cube:DataElement.axis"> 
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:TimeMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.temporal.TimeOffset">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
                         <COLUMN ref="_col-time" dmtype="ivoa:RealQuantity"/>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.temporal.TimeCoord.axis">
-                        <IDREF>_0118WLLnSEBj0p462</IDREF>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0118WLLnSEBj0p46</IDREF>
                       </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords:domain.spatial.Position2D">
-                  <ATTRIBUTE dmrole="coords:domain.spatial.Position2D.coord">
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-x" dmtype="ivoa:RealQuantity"/>
-                      </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_0105Kby9hIzCYJPJ2</IDREF>
-                      </REFERENCE>
-                    </INSTANCE>
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-y" dmtype="ivoa:RealQuantity"/>
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:Position2D">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+                      <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-x" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_0105Kby9hIzCYJPJ</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-y" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_0105W9piipgxj8Lq</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_0105W9piipgxj8Lq2</IDREF>
-                      </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords:domain.spatial.Position2D">
-                  <ATTRIBUTE dmrole="coords:domain.spatial.Position2D.coord">
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-ra" dmtype="ivoa:RealQuantity"/>
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:Position2D">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+                      <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-ra" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_01017W9piipgxj8L</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
+                        <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                          <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                            <COLUMN ref="_col-dec" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                            <IDREF>_01017cwvI7yS93aI</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_01017W9piipgxj8L2</IDREF>
-                      </REFERENCE>
-                    </INSTANCE>
-                    <INSTANCE dmtype="coordsys:domain.spatial.SpatialCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spatial.SpatialCoord.loc">
-                        <COLUMN ref="_col-dec" dmtype="ivoa:RealQuantity"/>
-                      </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spatial.SpatialCoord.axis">
-                        <IDREF>_01017cwvI7yS93aI2</IDREF>
-                      </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
                 </INSTANCE>
               </COMPOSITION> 
             </INSTANCE>
-            <INSTANCE dmtype="cube:DataAxis">
-              <COMPOSITION dmrole="cube:DataAxis.observable"> 
-                <INSTANCE dmtype="coords:domain.spectral.Energy">
-                  <ATTRIBUTE dmrole="coords:domain.spectral.DerivedSpectralCoordinate.coord">
-                    <INSTANCE dmtype="coordsys:domain.spectral.SpectralCoord">
-                      <ATTRIBUTE dmrole="coordsys:domain.spectral.SpectralCoord.loc">
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:SpectralCoordMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spectral.SpectralValue">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
                         <COLUMN ref="_col-pha" dmtype="ivoa:RealQuantity"/>
                       </ATTRIBUTE>
-                      <REFERENCE dmrole="coordsys:domain.spectral.SpectralCoord.axis">
-                        <IDREF>_0129ge70cAi4MErU2</IDREF>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0129ge70cAi4MErU</IDREF>
                       </REFERENCE>
                     </INSTANCE>
                   </ATTRIBUTE>
@@ -760,494 +731,194 @@
   </VODML>
   <RESOURCE>
     <TABLE ID="_table1">
-      <GROUP ID="_001J6U7FbgCwoWQF" name="SAO">
-        <DESCRIPTION>Smithsonian Astrophysical Observatory</DESCRIPTION>
-        <PARAM ID="_001LrAjgQQfUzcfv" name="name" datatype="char" arraysize="24" value="The Chandra X-Ray Center"/>
-        <PARAM ID="_001QE4mxmePP6gt9" name="address" datatype="char" arraysize="41" value="60 Garden Street, Cambridge, MA 02138 USA"/>
-        <PARAM ID="_001R0jW5TKzkQ8Lz" name="email" datatype="char" arraysize="27" ucd="meta.ref.url;meta.email" value="cxcweb at head.cfa.harvard.edu"/>
-        <PARAM ID="_001dDUBXHoOSB9wX" name="phone" datatype="char" arraysize="12" value="617-496-7941"/>
-        <PARAM ID="_001gfnUmg1OEVIwq" name="logo" datatype="char" arraysize="52" ucd="meta.ref.url" value="http://chandra.si.edu/graphics/top/icon_cxc_foot.jpg"/>
-      </GROUP>
-      <GROUP ID="_002J6U7FbgCwoWQF" name="CXCHelpdesk">
-        <DESCRIPTION>Contact Individual</DESCRIPTION>
-        <PARAM ID="_002LrAjgQQfUzcfv" name="name" datatype="char" arraysize="19" value="CXC HelpDesk System"/>
-        <PARAM ID="_002QE4mxmePP6gt9" name="address" datatype="char" arraysize="3" value="N/A"/>
-        <PARAM ID="_002R0jW5TKzkQ8Lz" name="email" datatype="char" arraysize="28" ucd="meta.ref.url;meta.email" value="cxchelp at head.cfa.harvard.edu"/>
-        <PARAM ID="_002dDUBXHoOSB9wX" name="phone" datatype="char" arraysize="3" value="N/A"/>
-      </GROUP>
-      <GROUP ID="_0117pYWsEJmSbhJP" name="TimeFrame">
-        <DESCRIPTION>TIME - Physical temporal domain frame</DESCRIPTION>
-        <PARAM ID="_0117wfKnTYv8NLOK" name="timescale" datatype="char" arraysize="2" value="TT"/>
-        <GROUP name="refPosition">
-          <PARAM ID="_0118TZnYKkxxCzyE" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <GROUP name="offset">
-          <PARAM ID="_0118HEAjt4qRFTI5" name="loc" datatype="double" value="50814.0"/>
-        </GROUP>
-        <GROUP name="TimeFrame_CoordSpace">
-          <DESCRIPTION>Time coordinate space</DESCRIPTION>
-          <GROUP ID="_0118WLLnSEBj0p46" name="Time_CoordAxis">
-            <DESCRIPTION>time axis</DESCRIPTION>
-            <PARAM ID="_0118cF2Rm82EU45n" name="name" datatype="char" arraysize="4" value="time"/>
-            <PARAM ID="_0118cF2Rm82EU45p" name="domainMin" datatype="double" value="-Inf"/>
-            <PARAM ID="_0118ceJK1JFBuxCY" name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_01290NTXcYmRii44" name="PHAFrame">
-        <DESCRIPTION>PHA - Physical spectral domain frame</DESCRIPTION>
-        <GROUP name="refPosition">
-          <PARAM ID="_0129bEaqPQiuXGGP" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <GROUP name="PHAFrame_CoordSpace">
-          <DESCRIPTION>PHA coordinate space</DESCRIPTION>
-          <GROUP ID="_0129ge70cAi4MErU" name="PHA_CoordAxis">
-            <DESCRIPTION>pha axis</DESCRIPTION>
-            <PARAM ID="_0129hu1SarMbOnaT" name="name" datatype="char" arraysize="3" value="pha"/>
-            <PARAM ID="_0129hu1SarMbOnaU" name="domainMin" datatype="double" value="0" unit="chan"/>
-            <PARAM ID="_0129o6A8iklnaxZm" name="domainMax" datatype="double" value="255" unit="chan"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_01390NTXcYmRii44" name="PIFrame">
-        <DESCRIPTION>PI - Physical spectral domain frame</DESCRIPTION>
-        <GROUP name="refPosition">
-          <PARAM ID="_0139bEaqPQiuXGGP" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <GROUP name="PIFrame_CoordSpace">
-          <DESCRIPTION>PI coordinate space</DESCRIPTION>
-          <GROUP name="PI_CoordAxis">
-            <DESCRIPTION>pi axis</DESCRIPTION>
-            <PARAM ID="_0139hu1SarMbOnaT" name="name" datatype="char" arraysize="2" value="pi"/>
-            <PARAM ID="_0139hu1SarMbOnaU" name="domainMin" datatype="double" value="0" unit="chan"/>
-            <PARAM ID="_0139o6A8iklnaxZm" name="domainMax" datatype="double" value="1023" unit="chan"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010212XxjJ6d2Yfk" name="ChipFrame">
-        <DESCRIPTION>CHIP - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM ID="_0102GrdyEo0SN7Ds" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM ID="_01021jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="ChipFrame_CoordSpace">
-          <DESCRIPTION>CHIP coordinate space (Cartesian)</DESCRIPTION>
-          <GROUP name="Chip_X-Axis">
-            <DESCRIPTION>chipx axis</DESCRIPTION>
-            <PARAM ID="_0102OyyH8HFLPhaO" name="name" datatype="char" arraysize="5" value="chipx"/>
-            <PARAM ID="_0102OyyH8HFLPhbO" name="domainMin" datatype="double" value="1" unit="pixel"/>
-            <PARAM ID="_0102TEQM98JBAYHu" name="domainMax" datatype="double" value="4096" unit="pixel"/>
-          </GROUP>
-          <GROUP name="Chip_Y-Axis">
-            <DESCRIPTION>chipy axis</DESCRIPTION>
-            <PARAM ID="_0102bl4ryZpLwCUc" name="name" datatype="char" arraysize="5" value="chipy"/>
-            <PARAM ID="_0102bl4ryZpLwCUd" name="domainMin" datatype="double" value="1" unit="pixel"/>
-            <PARAM ID="_0102bx0oGeMSniEK" name="domainMax" datatype="double" value="16456" unit="pixel"/>
-          </GROUP>
-          <GROUP name="Chip_Z-Axis">
-            <DESCRIPTION>chip_id axis</DESCRIPTION>
-            <PARAM ID="_0102e3zBfvt1YxKm" name="name" datatype="char" arraysize="6" value="ccd_id"/>
-            <PARAM ID="_0102e3zBfvt1YxKn" name="domainMin" datatype="int" value="1"/>
-            <PARAM ID="_0102f0jRCn9ZYWEB" name="domainMax" datatype="int" value="3"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010312XxjJ6d2Yfk" name="TDETFrame">
-        <DESCRIPTION>TDET - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM ID="_0103GrdyEo0SN7Ds" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM ID="_01031jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="TDETFrame_CoordSpace">
-          <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
-          <GROUP name="TDET_X-Axis">
-            <DESCRIPTION>tdetx axis</DESCRIPTION>
-            <PARAM ID="_0103OyyH8HFLPhaO" name="name" datatype="char" arraysize="5" value="tdetx"/>
-            <PARAM ID="_0103OyyH8HFLPhbO" name="domainMin" datatype="double" value="1" unit="pixel"/>
-            <PARAM ID="_0103TEQM98JBAYHu" name="domainMax" datatype="double" value="4096" unit="pixel"/>
-          </GROUP>
-          <GROUP name="TDET_Y-Axis">
-            <DESCRIPTION>tdety axis</DESCRIPTION>
-            <PARAM ID="_0103bl4ryZpLwCUc" name="name" datatype="char" arraysize="5" value="tdety"/>
-            <PARAM ID="_0103bl4ryZpLwCUd" name="domainMin" datatype="double" value="1" unit="pixel"/>
-            <PARAM ID="_0103bx0oGeMSniEK" name="domainMax" datatype="double" value="49368" unit="pixel"/>
-          </GROUP>
-          <GROUP name="TDET_Z-Axis">
-            <DESCRIPTION>z axis</DESCRIPTION>
-            <PARAM ID="_0103e3zBfvt1YxKn" name="domainMin" datatype="double" value="0.0"/>
-            <PARAM ID="_0103f0jRCn9ZYWEB" name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010412XxjJ6d2Yfk" name="DETFrame">
-        <DESCRIPTION>DET - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM ID="_0104GrdyEo0SN7Ds" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM ID="_01041jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="DETFrame_CoordSpace">
-          <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
-          <GROUP name="DET_X-Axis">
-            <DESCRIPTION>detx axis</DESCRIPTION>
-            <PARAM ID="_0104OyyH8HFLPhaO" name="name" datatype="char" arraysize="4" value="detx"/>
-            <PARAM ID="_0104OyyH8HFLPhbO" name="domainMin" datatype="double" value="0.5" unit="pixel"/>
-            <PARAM ID="_0104TEQM98JBAYHu" name="domainMax" datatype="double" value="65536.5" unit="pixel"/>
-          </GROUP>
-          <GROUP name="DET_Y-Axis">
-            <DESCRIPTION>dety axis</DESCRIPTION>
-            <PARAM ID="_0104bl4ryZpLwCUc" name="name" datatype="char" arraysize="4" value="dety"/>
-            <PARAM ID="_0104bl4ryZpLwCUd" name="domainMin" datatype="double" value="0.5" unit="pixel"/>
-            <PARAM ID="_0104bx0oGeMSniEK" name="domainMax" datatype="double" value="65536.5" unit="pixel"/>
-          </GROUP>
-          <GROUP name="DET_Z-Axis">
-            <DESCRIPTION>z axis</DESCRIPTION>
-            <PARAM ID="_0104e3zBfvt1YxKn" name="domainMin" datatype="double" value="0.0"/>
-            <PARAM ID="_0104f0jRCn9ZYWEB" name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_010512XxjJ6d2Yfk" name="SkyFrame">
-        <DESCRIPTION>SKY - Physical spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM ID="_0105GrdyEo0SN7Ds" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM ID="_01051jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
-        <GROUP name="SkyFrame_CoordSpace">
-          <DESCRIPTION>Cartesian coordinate space</DESCRIPTION>
-          <GROUP ID="_0105Kby9hIzCYJPJ" name="Sky_X-Axis">
-            <DESCRIPTION>x axis</DESCRIPTION>
-            <PARAM ID="_0105OyyH8HFLPhaO" name="name" datatype="char" arraysize="1" value="x"/>
-            <PARAM ID="_0105OyyH8HFLPhbO" name="domainMin" datatype="double" value="0.5" unit="pixel"/>
-            <PARAM ID="_0105TEQM98JBAYHu" name="domainMax" datatype="double" value="65536.5" unit="pixel"/>
-          </GROUP>
-          <GROUP ID="_0105W9piipgxj8Lq" name="Sky_Y-Axis">
-            <DESCRIPTION>y axis</DESCRIPTION>
-            <PARAM ID="_0105bl4ryZpLwCUc" name="name" datatype="char" arraysize="1" value="y"/>
-            <PARAM ID="_0105bl4ryZpLwCUd" name="domainMin" datatype="double" value="0.5" unit="pixel"/>
-            <PARAM ID="_0105bx0oGeMSniEK" name="domainMax" datatype="double" value="65536.5" unit="pixel"/>
-          </GROUP>
-          <GROUP name="Sky_Z-Axis">
-            <DESCRIPTION>z axis</DESCRIPTION>
-            <PARAM ID="_0105e3zBfvt1YxKn" name="domainMin" datatype="double" value="0.0"/>
-            <PARAM ID="_0105f0jRCn9ZYWEB" name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_01016p6qFkb1I2p7" name="ICRSFrame">
-        <DESCRIPTION>EQPOS - World spatial domain frame</DESCRIPTION>
-        <GROUP name="origin">
-          <PARAM ID="_010174BLUAVSMDVw" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
-        </GROUP>
-        <PARAM ID="_01016u2XxjJ6d2Yf" name="orientation" datatype="char" arraysize="4" value="ICRS"/>
-        <GROUP name="equinox">
-          <PARAM ID="_01017fNEHUi0m9rW" name="type" datatype="char" arraysize="1" value="J"/>
-          <PARAM ID="_01017foOjpZJkO0E" name="year" datatype="double" value="2000.0"/>
-        </GROUP>
-        <GROUP name="ICRSFrame_CoordSpace">
-          <DESCRIPTION>Spherical coordinate space</DESCRIPTION>
-          <GROUP name="ICRS_R-Axis">
-            <DESCRIPTION>r axis</DESCRIPTION>
-            <PARAM ID="_01017OyyH8HFLPhb" name="domainMin" datatype="double" value="0"/>
-            <PARAM ID="_01017TEQM98JBAYH" name="domainMax" datatype="double" value="+Inf"/>
-          </GROUP>
-          <GROUP ID="_01017W9piipgxj8L" name="ICRS_Theta-Axis">
-            <DESCRIPTION>ra axis</DESCRIPTION>
-            <PARAM ID="_01017bl4ryZpLwCT" name="name" datatype="char" arraysize="2" value="ra"/>
-            <PARAM ID="_01017bl4ryZpLwCU" name="domainMin" datatype="double" value="0.0" unit="deg"/>
-            <PARAM ID="_01017bx0oGeMSniE" name="domainMax" datatype="double" value="360.0" unit="deg"/>
-          </GROUP>
-          <GROUP ID="_01017cwvI7yS93aI" name="ICRS_Phi-Axis">
-            <DESCRIPTION>dec axis</DESCRIPTION>
-            <PARAM ID="_01017e3zBfvt1YxJ" name="name" datatype="char" arraysize="3" value="dec"/>
-            <PARAM ID="_01017e3zBfvt1YxK" name="domainMin" datatype="double" value="-90.0" unit="deg"/>
-            <PARAM ID="_01017f0jRCn9ZYWE" name="domainMax" datatype="double" value="+90.0" unit="deg"/>
-          </GROUP>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_HPykZjnKKegGJhyB" name="TargetPosition">
-        <GROUP name="coord">
-          <PARAM ID="_HhKAdKcKlhfiUsag" name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_Theta-Axis"/>
-        </GROUP>
-        <GROUP name="coord">
-          <PARAM ID="_HwTBlKFGp2MWVh1Q" name="loc" datatype="double" value="NaN"/>
-          <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_Phi-Axis"/>
-        </GROUP>
-      </GROUP>
-      <GROUP name="SparseCubeDataset">
-        <DESCRIPTION>Sparse Cube Dataset</DESCRIPTION>
-        <PARAM ID="_07Yrfb1KUNZfOEK8" name="dataProductType" datatype="char" arraysize="5" ucd="meta.id" value="EVENT">
-          <DESCRIPTION>Dataset type</DESCRIPTION>
-        </PARAM>
-        <PARAM ID="_0DcwmCqLzkpXADh4" name="dataProductSubtype" datatype="char" arraysize="11" ucd="meta.id" value="Sparse Cube">
-          <DESCRIPTION>Dataset subtype</DESCRIPTION>
-        </PARAM>
-        <PARAM ID="_0GQQpjxvwn9XD0e1" name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
-          <DESCRIPTION>Calibration level</DESCRIPTION>
-        </PARAM>
-        <GROUP name="Characterisation">
-          <DESCRIPTION>Characteristics of data coordinate space</DESCRIPTION>
-        </GROUP>
-        <GROUP name="Curation">
-          <DESCRIPTION>Dataset curation metadata</DESCRIPTION>
-          <PARAM ID="_1O5vXPfA8U80BgHg" name="publisherDID" datatype="char" arraysize="20" ucd="meta.ref.url;meta.curation" value="ADS/Sa.CXO#obs/00460">
-            <DESCRIPTION>Publisher specified dataset ID</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1UfAoyYjyHKhMD0H" name="version" datatype="char" arraysize="1" ucd="meta.version;meta.curation" value="5">
-            <DESCRIPTION>Publisher version of the dataset</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1XoOkGpCBycuUMNg" name="releaseDate" datatype="char" arraysize="19" ucd="time.release" value="2014-09-16T21:33:56">
-            <DESCRIPTION>Date curated dataset last modified time.release</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1Yy1BxGML9rCbZm0" name="rights" datatype="char" arraysize="6" ucd="meta.code" value="PUBLIC">
-            <DESCRIPTION>Level of access granted</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Contact">
-            <DESCRIPTION>Contact entity for curation service</DESCRIPTION>
-            <GROUP ref="_002J6U7FbgCwoWQF" name="REF_CXCHelpdesk">
-              <DESCRIPTION>Entity associated with Contact role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Publisher">
-            <DESCRIPTION>Publisher</DESCRIPTION>
-            <PARAM ID="_2FyzrxBRroXJYrrJ" name="publisherID" datatype="char" arraysize="3" ucd="meta.ref.url;meta.curation" value="TBD">
-              <DESCRIPTION>URI for VO Publisher</DESCRIPTION>
-            </PARAM>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Entity associated with Publisher role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Publication">
-            <DESCRIPTION>Reference to publication associated with the dataset</DESCRIPTION>
-            <PARAM ID="_39TH5KgHQA2gDNx7" name="refCode" datatype="char" arraysize="19" ucd="meta.bib.bibcode" value="YYYYJJJJJVVVVMPPPPA">
-              <DESCRIPTION>URL or Bibcode of the publication</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="DataID">
-          <DESCRIPTION>Dataset identification metadata</DESCRIPTION>
-          <PARAM ID="_3BP3wPIobUK2MMPb" name="title" datatype="char" arraysize="78" ucd="meta.title;meta.dataset" value="IN FLIGHT CALIBRATION OF THE HETGS EFFECTIVE AREA AND CROSS DISPERSION PROFILE">
-            <DESCRIPTION>Dataset Title</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_3Ko2JyvGSnp9kPFC" name="datasetID" datatype="char" arraysize="20" ucd="meta.id;meta.dataset" value="ADS/Sa.CXO#obs/00460">
-            <DESCRIPTION>IVOA Dataset Identifier</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_3MNpvGqLmbAgJ0iO" name="creatorDID" datatype="char" arraysize="20" ucd="meta.id" value="ADS/Sa.CXO#obs/00460">
-            <DESCRIPTION>Creator defined Dataset Identifier</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_3czgnsjeBuaz1VA6" name="version" datatype="char" arraysize="1" ucd="meta.version;meta.dataset" value="5">
-            <DESCRIPTION>Dataset version assigned by creator</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_3kusBO5Vi7a8i2Bs" name="date" datatype="char" arraysize="19" ucd="time.epoch;meta.dataset" value="2014-09-16T21:33:56">
-            <DESCRIPTION>Data processing/creation date</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_3lBLZy5MGZtbq6z1" name="creationType" datatype="char" arraysize="8" value="ARCHIVAL">
-            <DESCRIPTION>Dataset creation type</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Collection">
-            <DESCRIPTION>Collection to which the dataset is a member</DESCRIPTION>
-            <PARAM ID="_3zibPIoz0P3g6Vg9" name="name" datatype="char" arraysize="7" value="Chandra">
-              <DESCRIPTION>Collection name</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-          <GROUP name="Contributor">
-            <DESCRIPTION>Contributor</DESCRIPTION>
-            <PARAM ID="_41oqw2x4Vn7JMqHy" name="acknowledgment" datatype="char" arraysize="129" value="CIAO: Chandra's data analysis system (ADS, PS); Fruscione et al. 2006, SPIE Proc. 6270, 62701V, D.R. Silvia and R.E. Doxsey, eds.">
-              <DESCRIPTION>Acknowledgment expression for the contributor</DESCRIPTION>
-            </PARAM>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Individual associated with Contributor role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Creator">
-            <DESCRIPTION>Institution or entity which created the dataset</DESCRIPTION>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Individual associated with the Creator role.</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Derived">
-          <DESCRIPTION>Derived metadata</DESCRIPTION>
-          <GROUP name="ONTIME">
-            <DESCRIPTION>property derived from analysis of data content</DESCRIPTION>
-            <PARAM ID="_5SLMkv4jJLqDeTHa" name="name" datatype="char" arraysize="8" value="EXPOSURE">
-              <DESCRIPTION>Total exposure time, with all known corrections</DESCRIPTION>
-            </PARAM>
-            <PARAM ID="_5UKRXkncAyseKMgT" name="value" datatype="double" value="39930.0463526">
-              <DESCRIPTION>value of derived property</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="ObsConfig">
-          <DESCRIPTION>ObsConfig Object</DESCRIPTION>
-          <PARAM ID="_5UozFhanJugquCM1" name="bandpass" datatype="char" arraysize="4" ucd="instr.bandpass" value="XRAY">
-            <DESCRIPTION>General regime in spectral domain</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_5YfO8GkjuqSEqt2s" name="datasource" datatype="char" arraysize="7" value="POINTED">
-            <DESCRIPTION>Original source/type of data</DESCRIPTION>
-          </PARAM>
-          <GROUP name="Facility">
-            <DESCRIPTION>Metadata for the facility performing the observation</DESCRIPTION>
-            <GROUP ref="_001J6U7FbgCwoWQF" name="REF_SAO">
-              <DESCRIPTION>Organization responsible for performing the observation</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-          <GROUP name="Instrument">
-            <DESCRIPTION>Metadata for the Instrument which created the data</DESCRIPTION>
-            <PARAM ID="_60HpJl6Eph8CdiKZ" name="name" datatype="char" arraysize="7" ucd="meta.id;instr" value="CHANDRA">
-              <DESCRIPTION>Instrument ID</DESCRIPTION>
-            </PARAM>
-          </GROUP>
-        </GROUP>
-        <GROUP name="Proposal">
-          <DESCRIPTION>Proposal Object</DESCRIPTION>
-          <PARAM ID="_60NnazyCoAERdJZn" name="identifier" datatype="char" arraysize="8" ucd="meta.id;obs.proposal" value="12345678">
-            <DESCRIPTION>Proposal ID</DESCRIPTION>
-          </PARAM>
-        </GROUP>
-        <GROUP name="AstroTarget">
-          <DESCRIPTION>AstroTarget Object</DESCRIPTION>
-          <PARAM ID="_0ylm8ZmZQyFkdnQ5" name="name" datatype="char" arraysize="6" ucd="meta.id;src" value="3C 273">
-            <DESCRIPTION>Target name</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_17h6AWop4BLek351" name="description" datatype="char" arraysize="3" ucd="meta.note;src" value="TBD">
-            <DESCRIPTION>Target descriptive text</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_17uibvmtc6H9lpWs" name="objectClass" datatype="char" arraysize="3" ucd="src.class" value="TBD">
-            <DESCRIPTION>Target or object class</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1CJrcE00bxzwh5x2" name="spectralClass" datatype="char" arraysize="3" ucd="src.spType" value="TBD">
-            <DESCRIPTION>Object spectral class</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1H6gBwZiDI8Xwnbb" name="redshift" datatype="double" ucd="src.redshift" value="NaN">
-            <DESCRIPTION>Target redshift</DESCRIPTION>
-          </PARAM>
-          <PARAM ID="_1JakggUBNfow3eQQ" name="varAmpl" datatype="double" value="NaN">
-            <DESCRIPTION>Target variability amplitude - typical</DESCRIPTION>
-          </PARAM>
-          <GROUP ref="_HPykZjnKKegGJhyB" name="REF_TargetPosition">
-            <DESCRIPTION>Target location (eg: RA, DEC)</DESCRIPTION>
-          </GROUP>
-        </GROUP>
-        <GROUP ref="_6hrehomO3bIilaTo" name="REF_CoordSys-Phys">
-          <DESCRIPTION>Global coordinate systems (Physical)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A18RNKjFBdI7kMap" name="REF_CoordSys-World">
-          <DESCRIPTION>Global coordinate systems (World)</DESCRIPTION>
-        </GROUP>
-        <GROUP ref="_A9OKA8Pw7UvuTGbF" name="REF_SparseCube">
-          <DESCRIPTION>Sparse Cube point data</DESCRIPTION>
-        </GROUP>
-      </GROUP>
-      <GROUP ID="_A9OKA8Pw7UvuTGbF" name="SparseCube">
-        <GROUP ID="_6hrehomO3bIilaTo" name="CoordSys-Phys">
-          <DESCRIPTION>Physical Coordinate System</DESCRIPTION>
-          <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame"/>
-          <GROUP ref="_0117pYWsEJmSbhJP" name="REF_TimeFrame"/>
-          <GROUP ref="_01390NTXcYmRii44" name="REF_PIFrame"/>
-        </GROUP>
-        <GROUP ID="_A18RNKjFBdI7kMap" name="CoordSys-World">
-          <DESCRIPTION>World Coordinate System</DESCRIPTION>
-          <GROUP ref="_01016p6qFkb1I2p7" name="REF_ICRSFrame"/>
-          <GROUP ref="_0117pYWsEJmSbhJP" name="REF_TimeFrame"/>
-          <GROUP ref="_01390NTXcYmRii44" name="REF_PIFrame"/>
-        </GROUP>
-        <GROUP name="Mappings">
-          <DESCRIPTION>Frame Transforms</DESCRIPTION>
-          <GROUP name="SKY2EQPOS">
-            <DESCRIPTION>Sky-to-EQPOS Transform</DESCRIPTION>
-            <GROUP name="SKY2EQPOS_Projection">
-              <DESCRIPTION>WCS Projection instance</DESCRIPTION>
-              <PARAM ID="_EiGlcXZVSiJplxAz" name="algorithm" datatype="char" arraysize="3" value="TAN">
-                <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
-              </PARAM>
-              <GROUP name="SKY2EQPOS_AXIS1">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM ID="_EjwPLdgNb6AmcarD" name="nativeRefValue" datatype="double" value="32768.5">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_EjwtrSyf9qMAAFIk" name="targetRefValue" datatype="double" value="187.280152947">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_Ek0aE6wVGaNtSojR" name="scale" datatype="double" value="-3.66111111111e-05">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-              <GROUP name="SKY2EQPOS_AXIS2">
-                <DESCRIPTION>WCS Projection axis spec</DESCRIPTION>
-                <PARAM ID="_Eku9k8u8Jo3wSffi" name="nativeRefValue" datatype="double" value="32768.5">
-                  <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_El3niMh2XAO0IBg3" name="targetRefValue" datatype="double" value="2.05700100372">
-                  <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
-                </PARAM>
-                <PARAM ID="_ElSOA0YK3fVcaZen" name="scale" datatype="double" value="3.66111111111e-05">
-                  <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
-                </PARAM>
-              </GROUP>
-            </GROUP>
-            <GROUP ref="_010512XxjJ6d2Yfk" name="REF_SkyFrame">
-              <DESCRIPTION>Originating Frame (sky)</DESCRIPTION>
-            </GROUP>
-            <GROUP ref="_01016p6qFkb1I2p7" name="REF_ICRSFrame">
-              <DESCRIPTION>Resulting Frame (eqpos)</DESCRIPTION>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-        <GROUP name="NDPoint">
-          <GROUP name="TimeDataAxis">
-            <DESCRIPTION>Time Domain data axis</DESCRIPTION>
-            <GROUP name="TimeData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-time"/>
-                <GROUP ref="_0118WLLnSEBj0p46" name="REF_Time_CoordAxis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="SKYDataAxis">
-            <DESCRIPTION>Spatial Domain data axis - Sky</DESCRIPTION>
-            <GROUP name="SKYData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-x"/>
-                <GROUP ref="_0105Kby9hIzCYJPJ" name="REF_Sky_X-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-y"/>
-                <GROUP ref="_0105W9piipgxj8Lq" name="REF_Sky_Y-Axis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="EQPOSDataAxis">
-            <DESCRIPTION>Spatial Domain data axis - EQPOS</DESCRIPTION>
-            <GROUP name="EQPOSData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-ra"/>
-                <GROUP ref="_01017W9piipgxj8L" name="REF_ICRS_Theta-Axis"/>
-              </GROUP>
-              <GROUP name="coord">
-                <FIELDref ref="_col-dec"/>
-                <GROUP ref="_01017cwvI7yS93aI" name="REF_ICRS_Phi-Axis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-          <GROUP name="PHADataAxis">
-            <DESCRIPTION>Spectral Domain data axis - PHA</DESCRIPTION>
-            <GROUP name="PHAData">
-              <GROUP name="coord">
-                <FIELDref ref="_col-pha"/>
-                <GROUP ref="_0129ge70cAi4MErU" name="REF_PHA_CoordAxis"/>
-              </GROUP>
-            </GROUP>
-          </GROUP>
-        </GROUP>
-      </GROUP>
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM ID="_001LrAjgQQfUzcfv" name="name" datatype="char" arraysize="24" value="The Chandra X-Ray Center"/>
+      <PARAM ID="_001QE4mxmePP6gt9" name="address" datatype="char" arraysize="41" value="60 Garden Street, Cambridge, MA 02138 USA"/>
+      <PARAM ID="_001R0jW5TKzkQ8Lz" name="email" datatype="char" arraysize="27" ucd="meta.ref.url;meta.email" value="cxcweb at head.cfa.harvard.edu"/>
+      <PARAM ID="_001dDUBXHoOSB9wX" name="phone" datatype="char" arraysize="12" value="617-496-7941"/>
+      <PARAM ID="_001gfnUmg1OEVIwq" name="logo" datatype="char" arraysize="52" ucd="meta.ref.url" value="http://chandra.si.edu/graphics/top/icon_cxc_foot.jpg"/>
+      <PARAM ID="_002LrAjgQQfUzcfv" name="name" datatype="char" arraysize="19" value="CXC HelpDesk System"/>
+      <PARAM ID="_002QE4mxmePP6gt9" name="address" datatype="char" arraysize="3" value="N/A"/>
+      <PARAM ID="_002R0jW5TKzkQ8Lz" name="email" datatype="char" arraysize="28" ucd="meta.ref.url;meta.email" value="cxchelp at head.cfa.harvard.edu"/>
+      <PARAM ID="_002dDUBXHoOSB9wX" name="phone" datatype="char" arraysize="3" value="N/A"/>
+      <PARAM ID="_0117wfKnTYv8NLOK" name="timescale" datatype="char" arraysize="2" value="TT"/>
+      <PARAM ID="_0118HEAjt4qRFTI5" name="value" datatype="double" value="50814.0"/>
+      <PARAM ID="_0118cF2Rm82EU45n" name="name" datatype="char" arraysize="4" value="time"/>
+      <PARAM ID="_0118cF2Rm82EU45p" name="domainMin" datatype="double" value="-Inf"/>
+      <PARAM ID="_0118ceJK1JFBuxCY" name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM ID="_0129hu1SarMbOnaT" name="name" datatype="char" arraysize="3" value="pha"/>
+      <PARAM ID="_0129hu1SarMbOnaU" name="domainMin" datatype="double" value="0" unit="chan"/>
+      <PARAM ID="_0129o6A8iklnaxZm" name="domainMax" datatype="double" value="255" unit="chan"/>
+      <PARAM ID="_0139hu1SarMbOnaT" name="name" datatype="char" arraysize="2" value="pi"/>
+      <PARAM ID="_0139hu1SarMbOnaU" name="domainMin" datatype="double" value="0" unit="chan"/>
+      <PARAM ID="_0139o6A8iklnaxZm" name="domainMax" datatype="double" value="1023" unit="chan"/>
+      <PARAM ID="_01021jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM ID="_0102OyyH8HFLPhaO" name="name" datatype="char" arraysize="5" value="chipx"/>
+      <PARAM ID="_0102OyyH8HFLPhbO" name="domainMin" datatype="double" value="1" unit="pixel"/>
+      <PARAM ID="_0102TEQM98JBAYHu" name="domainMax" datatype="double" value="4096" unit="pixel"/>
+      <PARAM ID="_0102bl4ryZpLwCUc" name="name" datatype="char" arraysize="5" value="chipy"/>
+      <PARAM ID="_0102bl4ryZpLwCUd" name="domainMin" datatype="double" value="1" unit="pixel"/>
+      <PARAM ID="_0102bx0oGeMSniEK" name="domainMax" datatype="double" value="16456" unit="pixel"/>
+      <PARAM ID="_0102e3zBfvt1YxKm" name="name" datatype="char" arraysize="6" value="ccd_id"/>
+      <PARAM ID="_0102e3zBfvt1YxKn" name="domainMin" datatype="int" value="1"/>
+      <PARAM ID="_0102f0jRCn9ZYWEB" name="domainMax" datatype="int" value="3"/>
+      <PARAM ID="_01031jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM ID="_0103OyyH8HFLPhaO" name="name" datatype="char" arraysize="5" value="tdetx"/>
+      <PARAM ID="_0103OyyH8HFLPhbO" name="domainMin" datatype="double" value="1" unit="pixel"/>
+      <PARAM ID="_0103TEQM98JBAYHu" name="domainMax" datatype="double" value="4096" unit="pixel"/>
+      <PARAM ID="_0103bl4ryZpLwCUc" name="name" datatype="char" arraysize="5" value="tdety"/>
+      <PARAM ID="_0103bl4ryZpLwCUd" name="domainMin" datatype="double" value="1" unit="pixel"/>
+      <PARAM ID="_0103bx0oGeMSniEK" name="domainMax" datatype="double" value="49368" unit="pixel"/>
+      <PARAM ID="_0103e3zBfvt1YxKn" name="domainMin" datatype="double" value="0.0"/>
+      <PARAM ID="_0103f0jRCn9ZYWEB" name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM ID="_01041jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM ID="_0104OyyH8HFLPhaO" name="name" datatype="char" arraysize="4" value="detx"/>
+      <PARAM ID="_0104OyyH8HFLPhbO" name="domainMin" datatype="double" value="0.5" unit="pixel"/>
+      <PARAM ID="_0104TEQM98JBAYHu" name="domainMax" datatype="double" value="65536.5" unit="pixel"/>
+      <PARAM ID="_0104bl4ryZpLwCUc" name="name" datatype="char" arraysize="4" value="dety"/>
+      <PARAM ID="_0104bl4ryZpLwCUd" name="domainMin" datatype="double" value="0.5" unit="pixel"/>
+      <PARAM ID="_0104bx0oGeMSniEK" name="domainMax" datatype="double" value="65536.5" unit="pixel"/>
+      <PARAM ID="_0104e3zBfvt1YxKn" name="domainMin" datatype="double" value="0.0"/>
+      <PARAM ID="_0104f0jRCn9ZYWEB" name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM ID="_01051jiJzYdXI6UP" name="orientation" datatype="char" arraysize="6" value="CUSTOM"/>
+      <PARAM ID="_0105OyyH8HFLPhaO" name="name" datatype="char" arraysize="1" value="x"/>
+      <PARAM ID="_0105OyyH8HFLPhbO" name="domainMin" datatype="double" value="0.5" unit="pixel"/>
+      <PARAM ID="_0105TEQM98JBAYHu" name="domainMax" datatype="double" value="65536.5" unit="pixel"/>
+      <PARAM ID="_0105bl4ryZpLwCUc" name="name" datatype="char" arraysize="1" value="y"/>
+      <PARAM ID="_0105bl4ryZpLwCUd" name="domainMin" datatype="double" value="0.5" unit="pixel"/>
+      <PARAM ID="_0105bx0oGeMSniEK" name="domainMax" datatype="double" value="65536.5" unit="pixel"/>
+      <PARAM ID="_0105e3zBfvt1YxKn" name="domainMin" datatype="double" value="0.0"/>
+      <PARAM ID="_0105f0jRCn9ZYWEB" name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM ID="_01016u2XxjJ6d2Yf" name="orientation" datatype="char" arraysize="4" value="ICRS"/>
+      <PARAM ID="_01017fNEHUi0m9rW" name="type" datatype="char" arraysize="1" value="J"/>
+      <PARAM ID="_01017foOjpZJkO0E" name="year" datatype="double" value="2000.0"/>
+      <PARAM ID="_01017OyyH8HFLPhb" name="domainMin" datatype="double" value="0"/>
+      <PARAM ID="_01017TEQM98JBAYH" name="domainMax" datatype="double" value="+Inf"/>
+      <PARAM ID="_01017bl4ryZpLwCT" name="name" datatype="char" arraysize="2" value="ra"/>
+      <PARAM ID="_01017bl4ryZpLwCU" name="domainMin" datatype="double" value="0.0" unit="deg"/>
+      <PARAM ID="_01017bx0oGeMSniE" name="domainMax" datatype="double" value="360.0" unit="deg"/>
+      <PARAM ID="_01017e3zBfvt1YxJ" name="name" datatype="char" arraysize="3" value="dec"/>
+      <PARAM ID="_01017e3zBfvt1YxK" name="domainMin" datatype="double" value="-90.0" unit="deg"/>
+      <PARAM ID="_01017f0jRCn9ZYWE" name="domainMax" datatype="double" value="+90.0" unit="deg"/>
+      <PARAM ID="_HhKAdKcKlhfiUsag" name="loc" datatype="double" value="NaN"/>
+      <PARAM ID="_HwTBlKFGp2MWVh1Q" name="loc" datatype="double" value="NaN"/>
+      <PARAM ID="_07Yrfb1KUNZfOEK8" name="dataProductType" datatype="char" arraysize="5" ucd="meta.id" value="EVENT">
+        <DESCRIPTION>Dataset type</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_0DcwmCqLzkpXADh4" name="dataProductSubtype" datatype="char" arraysize="11" ucd="meta.id" value="Sparse Cube">
+        <DESCRIPTION>Dataset subtype</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_0GQQpjxvwn9XD0e1" name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
+        <DESCRIPTION>Calibration level</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1O5vXPfA8U80BgHg" name="publisherDID" datatype="char" arraysize="20" ucd="meta.ref.url;meta.curation" value="ADS/Sa.CXO#obs/00460">
+        <DESCRIPTION>Publisher specified dataset ID</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1UfAoyYjyHKhMD0H" name="version" datatype="char" arraysize="1" ucd="meta.version;meta.curation" value="5">
+        <DESCRIPTION>Publisher version of the dataset</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1XoOkGpCBycuUMNg" name="releaseDate" datatype="char" arraysize="19" ucd="time.release" value="2014-09-16T21:33:56">
+        <DESCRIPTION>Date curated dataset last modified time.release</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1Yy1BxGML9rCbZm0" name="rights" datatype="char" arraysize="6" ucd="meta.code" value="PUBLIC">
+        <DESCRIPTION>Level of access granted</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_2FyzrxBRroXJYrrJ" name="publisherID" datatype="char" arraysize="3" ucd="meta.ref.url;meta.curation" value="TBD">
+        <DESCRIPTION>URI for VO Publisher</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_39TH5KgHQA2gDNx7" name="refCode" datatype="char" arraysize="19" ucd="meta.bib.bibcode" value="YYYYJJJJJVVVVMPPPPA">
+        <DESCRIPTION>URL or Bibcode of the publication</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3BP3wPIobUK2MMPb" name="title" datatype="char" arraysize="78" ucd="meta.title;meta.dataset" value="IN FLIGHT CALIBRATION OF THE HETGS EFFECTIVE AREA AND CROSS DISPERSION PROFILE">
+        <DESCRIPTION>Dataset Title</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3Ko2JyvGSnp9kPFC" name="datasetID" datatype="char" arraysize="20" ucd="meta.id;meta.dataset" value="ADS/Sa.CXO#obs/00460">
+        <DESCRIPTION>IVOA Dataset Identifier</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3MNpvGqLmbAgJ0iO" name="creatorDID" datatype="char" arraysize="20" ucd="meta.id" value="ADS/Sa.CXO#obs/00460">
+        <DESCRIPTION>Creator defined Dataset Identifier</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3czgnsjeBuaz1VA6" name="version" datatype="char" arraysize="1" ucd="meta.version;meta.dataset" value="5">
+        <DESCRIPTION>Dataset version assigned by creator</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3kusBO5Vi7a8i2Bs" name="date" datatype="char" arraysize="19" ucd="time.epoch;meta.dataset" value="2014-09-16T21:33:56">
+        <DESCRIPTION>Data processing/creation date</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3lBLZy5MGZtbq6z1" name="creationType" datatype="char" arraysize="8" value="ARCHIVAL">
+        <DESCRIPTION>Dataset creation type</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3zibPIoz0P3g6Vg9" name="name" datatype="char" arraysize="7" value="Chandra">
+        <DESCRIPTION>Collection name</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_41oqw2x4Vn7JMqHy" name="acknowledgment" datatype="char" arraysize="129" value="CIAO: Chandra's data analysis system (ADS, PS); Fruscione et al. 2006, SPIE Proc. 6270, 62701V, D.R. Silvia and R.E. Doxsey, eds.">
+        <DESCRIPTION>Acknowledgment expression for the contributor</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_5SLMkv4jJLqDeTHa" name="name" datatype="char" arraysize="8" value="EXPOSURE">
+        <DESCRIPTION>Total exposure time, with all known corrections</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_5UKRXkncAyseKMgT" name="value" datatype="double" value="39930.0463526">
+        <DESCRIPTION>value of derived property</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_5UozFhanJugquCM1" name="bandpass" datatype="char" arraysize="4" ucd="instr.bandpass" value="XRAY">
+        <DESCRIPTION>General regime in spectral domain</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_5YfO8GkjuqSEqt2s" name="datasource" datatype="char" arraysize="7" value="POINTED">
+        <DESCRIPTION>Original source/type of data</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_60HpJl6Eph8CdiKZ" name="name" datatype="char" arraysize="7" ucd="meta.id;instr" value="CHANDRA">
+        <DESCRIPTION>Instrument ID</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_60NnazyCoAERdJZn" name="identifier" datatype="char" arraysize="8" ucd="meta.id;obs.proposal" value="12345678">
+        <DESCRIPTION>Proposal ID</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_0ylm8ZmZQyFkdnQ5" name="name" datatype="char" arraysize="6" ucd="meta.id;src" value="3C 273">
+        <DESCRIPTION>Target name</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_17h6AWop4BLek351" name="description" datatype="char" arraysize="3" ucd="meta.note;src" value="TBD">
+        <DESCRIPTION>Target descriptive text</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_17uibvmtc6H9lpWs" name="objectClass" datatype="char" arraysize="3" ucd="src.class" value="TBD">
+        <DESCRIPTION>Target or object class</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1CJrcE00bxzwh5x2" name="spectralClass" datatype="char" arraysize="3" ucd="src.spType" value="TBD">
+        <DESCRIPTION>Object spectral class</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1H6gBwZiDI8Xwnbb" name="redshift" datatype="double" ucd="src.redshift" value="NaN">
+        <DESCRIPTION>Target redshift</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_1JakggUBNfow3eQQ" name="varAmpl" datatype="double" value="NaN">
+        <DESCRIPTION>Target variability amplitude - typical</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_010074BLUAVSMDVw" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <PARAM ID="_010074BLUAVSMDVw" name="coord" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <PARAM ID="_EiGlcXZVSiJplxAz" name="algorithm" datatype="char" arraysize="3" value="TAN">
+        <DESCRIPTION>WCS Projection algorithm</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_EjwPLdgNb6AmcarD" name="nativeRefValue" datatype="double" value="32768.5">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_EjwtrSyf9qMAAFIk" name="targetRefValue" datatype="double" value="187.280152947">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_Ek0aE6wVGaNtSojR" name="scale" datatype="double" value="-3.66111111111e-05">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_Eku9k8u8Jo3wSffi" name="nativeRefValue" datatype="double" value="32768.5">
+        <DESCRIPTION>WCS Projection native reference value (crpix)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_El3niMh2XAO0IBg3" name="targetRefValue" datatype="double" value="2.05700100372">
+        <DESCRIPTION>WCS Projection target reference value (crval)</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_ElSOA0YK3fVcaZen" name="scale" datatype="double" value="3.66111111111e-05">
+        <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
+      </PARAM>
       <!-- Data FIELDs -->
-      <FIELD ID="_col-time" name="time" datatype="double"/>
-      <FIELD ID="_col-x" name="x" datatype="double"/>
-      <FIELD ID="_col-y" name="y" datatype="double"/>
-      <FIELD ID="_col-ra" name="ra" datatype="double"/>
-      <FIELD ID="_col-dec" name="dec" datatype="double"/>
-      <FIELD ID="_col-pha" name="pha" datatype="double"/>
+      <FIELD ID="_col-time" name="time" datatype="double" unit="s"/>
+      <FIELD ID="_col-x" name="x" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-y" name="y" datatype="double" unit="pixel"/>
+      <FIELD ID="_col-ra" name="ra" datatype="double" unit="deg"/>
+      <FIELD ID="_col-dec" name="dec" datatype="double" unit="deg"/>
+      <FIELD ID="_col-pha" name="pha" datatype="double" unit="chan"/>
       <DATA>
         <FITS extnum="1">
           <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/chandra_grat_events.fits"/>

Added: trunk/projects/dm/CubeDM-1.0/examples/error_1D_asymmetric.dtf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/error_1D_asymmetric.dtf	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,8 @@
+#TEXT/DTF
+XTENSION= "TABLE   "          
+HDUNAME = "ERROR_1D_ASYMMETRIC"          
+EXTNAME = "ERROR_1D_ASYMMETRIC"          
+MAG     = -0.28                / Magnitude 
+MAGERRP = 0.0000985            / Error - plus
+MAGERRM = 0.0001752            / Error - minus
+END

Added: trunk/projects/dm/CubeDM-1.0/examples/error_1D_asymmetric_annotated_byref.vot
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/error_1D_asymmetric_annotated_byref.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.4_vodml">
+  <VODML>
+    <MODEL>
+      <NAME>coords</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>ivoa</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <GLOBALS>
+      <INSTANCE dmtype="coords:domain.generic.GenericFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.generic.GenericCoordSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0118WLLnSEBj0p46" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="mag"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE dmtype="meas:GenericCoordMeasure">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.generic.GenericCoordValue">
+            <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+              <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:CoordValue.coordAxis">
+              <IDREF>_0118WLLnSEBj0p46</IDREF>
+            </REFERENCE>
+          </INSTANCE>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="meas:CoordMeasure.error"> 
+          <INSTANCE dmtype="meas:BasicError1D">
+            <ATTRIBUTE dmrole="meas:BasicError1D.statError">
+              <INSTANCE dmtype="meas:Asymmetrical1D">
+                <ATTRIBUTE dmrole="meas:Asymmetrical1D.plus">
+                  <CONSTANT ref="_Hxs6Cs4SU21fqWOl" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="meas:Asymmetrical1D.minus">
+                  <CONSTANT ref="_Hxs9epUxk16kRN5d" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+    </GLOBALS>
+  </VODML>
+  <RESOURCE>
+    <TABLE ID="_table1">
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM ID="_HhKAdKcKlhfiUsag" name="mag" datatype="double" value="-0.28"/>
+      <PARAM ID="_Hxs6Cs4SU21fqWOl" name="mag_err_plus" datatype="double" value="9.85e-05"/>
+      <PARAM ID="_Hxs9epUxk16kRN5d" name="mag_err_minus" datatype="double" value="0.0001752"/>
+      <!-- Data FIELDs -->
+      <DATA>
+        <FITS extnum="1">
+          <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/error_1D_asymmetric.dtf"/>
+        </FITS>
+      </DATA>
+    </TABLE>
+  </RESOURCE>
+</VOTABLE>

Added: trunk/projects/dm/CubeDM-1.0/examples/error_1D_symmetric.dtf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/error_1D_symmetric.dtf	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,7 @@
+#TEXT/DTF
+XTENSION= "TABLE   "          
+HDUNAME = "ERROR_1D_SYMMETRIC"          
+EXTNAME = "ERROR_1D_SYMMETRIC"          
+MAG     = -0.28                / Magnitude 
+MAG_ERR = 0.0000285            / Error (+/-)
+END

Added: trunk/projects/dm/CubeDM-1.0/examples/error_1D_symmetric_annotated_byref.vot
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/error_1D_symmetric_annotated_byref.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.4_vodml">
+  <VODML>
+    <MODEL>
+      <NAME>coords</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>ivoa</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <GLOBALS>
+      <INSTANCE dmtype="coords:domain.generic.GenericFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.generic.GenericCoordSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0118WLLnSEBj0p46" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="mag"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE dmtype="meas:GenericCoordMeasure">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.generic.GenericCoordValue">
+            <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+              <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:CoordValue.coordAxis">
+              <IDREF>_0118WLLnSEBj0p46</IDREF>
+            </REFERENCE>
+          </INSTANCE>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="meas:CoordMeasure.error"> 
+          <INSTANCE dmtype="meas:BasicError1D">
+            <ATTRIBUTE dmrole="meas:BasicError1D.statError">
+              <INSTANCE dmtype="meas:Symmetrical1D">
+                <ATTRIBUTE dmrole="meas:Symmetrical1D.radius">
+                  <CONSTANT ref="_Hxs6Cs4SU21fqWOl" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+    </GLOBALS>
+  </VODML>
+  <RESOURCE>
+    <TABLE ID="_table1">
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM ID="_HhKAdKcKlhfiUsag" name="mag" datatype="double" value="-0.28"/>
+      <PARAM ID="_Hxs6Cs4SU21fqWOl" name="mag_err" datatype="double" value="2.85e-05"/>
+      <!-- Data FIELDs -->
+      <DATA>
+        <FITS extnum="1">
+          <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/error_1D_symmetric.dtf"/>
+        </FITS>
+      </DATA>
+    </TABLE>
+  </RESOURCE>
+</VOTABLE>

Added: trunk/projects/dm/CubeDM-1.0/examples/error_2D_ellipse.dtf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/error_2D_ellipse.dtf	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,10 @@
+#TEXT/DTF
+XTENSION= "TABLE   "          
+HDUNAME = "ERROR_2D_ELLIPSE"          
+EXTNAME = "ERROR_2D_ELLIPSE"          
+RA_PNT  = 12.9768538030848     / [deg] Pointing location - RA
+DEC_PNT = -72.9580158132637    / [deg] Pointing location - DEC
+ERR_MAJ = 4.1e-4               / [deg] Error Ellipse - semi major axis
+ERR_MIN = 2.7e-4               / [deg] Error Ellipse - semi minor axis
+ERR_ROT = 12.345               / [deg] Error Ellipse - position angle
+END

Added: trunk/projects/dm/CubeDM-1.0/examples/error_2D_ellipse_annotated_byref.vot
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/error_2D_ellipse_annotated_byref.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.4_vodml">
+  <VODML>
+    <MODEL>
+      <NAME>coords</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>ivoa</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <GLOBALS ID="Std_Frames">
+      <INSTANCE ID="_ICRS_FRAME" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="ICRS"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Spherical">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_RA_AXIS" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="ra"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
+                  <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="0.0"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
+                  <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="360.0"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+              <INSTANCE ID="_DEC_AXIS" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="dec"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
+                  <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="-90.0"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
+                  <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="+90.0"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+    </GLOBALS>
+    <GLOBALS>
+      <INSTANCE dmtype="meas:Position2D">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+            <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_RA_AXIS</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <CONSTANT ref="_HwTBlKFGp2MWVh1Q" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_DEC_AXIS</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+            </ATTRIBUTE>
+          </INSTANCE>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="meas:CoordMeasure.error"> 
+          <INSTANCE dmtype="meas:BasicError2D">
+            <ATTRIBUTE dmrole="meas:BasicError2D.statError">
+              <INSTANCE dmtype="meas:Ellipse">
+                <ATTRIBUTE dmrole="meas:Ellipse.semiAxis">
+                  <CONSTANT ref="_Hxs6Cs4SU21fqWOl" dmtype="ivoa:RealQuantity"/>
+                  <CONSTANT ref="_Hxs9epUxk16kRN5d" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="meas:Ellipse.posAngle">
+                  <CONSTANT ref="_HxsWoi32cQwNMxlt" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+    </GLOBALS>
+  </VODML>
+  <RESOURCE>
+    <TABLE ID="_table1">
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM ID="_HhKAdKcKlhfiUsag" name="ra_pnt" datatype="double" value="12.9768538031" unit="deg"/>
+      <PARAM ID="_HwTBlKFGp2MWVh1Q" name="dec_pnt" datatype="double" value="-72.9580158133" unit="deg"/>
+      <PARAM ID="_Hxs6Cs4SU21fqWOl" name="semiAxis1" datatype="double" value="0.00027" unit="deg"/>
+      <PARAM ID="_Hxs9epUxk16kRN5d" name="semiAxis2" datatype="double" value="0.00041" unit="deg"/>
+      <PARAM ID="_HxsWoi32cQwNMxlt" name="posAngle" datatype="double" value="12.345" unit="deg"/>
+      <!-- Data FIELDs -->
+      <DATA>
+        <FITS extnum="1">
+          <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/error_2D_ellipse.dtf"/>
+        </FITS>
+      </DATA>
+    </TABLE>
+  </RESOURCE>
+</VOTABLE>

Added: trunk/projects/dm/CubeDM-1.0/examples/error_2D_symmetric.dtf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/error_2D_symmetric.dtf	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,8 @@
+#TEXT/DTF
+XTENSION= "TABLE   "          
+HDUNAME = "ERROR_2D_SYMMETRIC"          
+EXTNAME = "ERROR_2D_SYMMETRIC"          
+RA_PNT  = 12.9768538030848     / [deg] Pointing location - RA
+DEC_PNT = -72.9580158132637    / [deg] Pointing location - DEC
+ERR_RAD = 2.7e-4               / [deg] Error Circle - radius
+END

Added: trunk/projects/dm/CubeDM-1.0/examples/error_2D_symmetric_annotated_byref.vot
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/error_2D_symmetric_annotated_byref.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.4_vodml">
+  <VODML>
+    <MODEL>
+      <NAME>coords</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>ivoa</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <GLOBALS ID="Std_Frames">
+      <INSTANCE ID="_ICRS_FRAME" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="ICRS"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Spherical">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_RA_AXIS" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="ra"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
+                  <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="0.0"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
+                  <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="360.0"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+              <INSTANCE ID="_DEC_AXIS" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="dec"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
+                  <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="-90.0"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
+                  <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="+90.0"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+    </GLOBALS>
+    <GLOBALS>
+      <INSTANCE dmtype="meas:Position2D">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+            <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_RA_AXIS</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <CONSTANT ref="_HwTBlKFGp2MWVh1Q" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_DEC_AXIS</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+            </ATTRIBUTE>
+          </INSTANCE>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="meas:CoordMeasure.error"> 
+          <INSTANCE dmtype="meas:BasicError2D">
+            <ATTRIBUTE dmrole="meas:BasicError2D.statError">
+              <INSTANCE dmtype="meas:Symmetrical2D">
+                <ATTRIBUTE dmrole="meas:Symmetrical2D.radius">
+                  <CONSTANT ref="_Hxs6Cs4SU21fqWOl" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+    </GLOBALS>
+  </VODML>
+  <RESOURCE>
+    <TABLE ID="_table1">
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM ID="_HhKAdKcKlhfiUsag" name="ra_pnt" datatype="double" value="12.9768538031" unit="deg"/>
+      <PARAM ID="_HwTBlKFGp2MWVh1Q" name="dec_pnt" datatype="double" value="-72.9580158133" unit="deg"/>
+      <PARAM ID="_Hxs6Cs4SU21fqWOl" name="radius" datatype="double" value="0.00027" unit="deg"/>
+      <!-- Data FIELDs -->
+      <DATA>
+        <FITS extnum="1">
+          <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/error_2D_symmetric.dtf"/>
+        </FITS>
+      </DATA>
+    </TABLE>
+  </RESOURCE>
+</VOTABLE>

Added: trunk/projects/dm/CubeDM-1.0/examples/position_fk4.dtf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/position_fk4.dtf	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,9 @@
+#TEXT/DTF
+XTENSION= "TABLE   "          
+HDUNAME = "POSITION_FK4"          
+EXTNAME = "POSITION_FK4"          
+RADESYS = "FK4"
+EQUINOX = "B1950.0"
+RA_PNT  = 12.9768538030848     / [deg] Pointing location - RA
+DEC_PNT = -72.9580158132637    / [deg] Pointing location - DEC
+END

Added: trunk/projects/dm/CubeDM-1.0/examples/position_fk4_annotated_byref.vot
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/position_fk4_annotated_byref.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.4_vodml">
+  <VODML>
+    <MODEL>
+      <NAME>coords</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>ivoa</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <GLOBALS ID="Std_Frames">
+      <INSTANCE ID="_FK4_FRAME" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="FK4"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.equinox">
+          <INSTANCE dmtype="coords:domain.spatial.Epoch">
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.type">
+              <LITERAL dmtype="coords:domain.spatial.EpochType" value="B"/>
+            </ATTRIBUTE>
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.year">
+              <LITERAL dmtype="ivoa:real" value="1950.0"/>
+            </ATTRIBUTE>
+          </INSTANCE>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Spherical">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_RA_AXIS" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="ra"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
+                  <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="0.0"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
+                  <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="360.0"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+              <INSTANCE ID="_DEC_AXIS" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="dec"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
+                  <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="-90.0"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
+                  <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="+90.0"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+    </GLOBALS>
+    <GLOBALS>
+      <INSTANCE dmtype="meas:Position2D">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+            <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_RA_AXIS</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <CONSTANT ref="_HwTBlKFGp2MWVh1Q" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_DEC_AXIS</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+            </ATTRIBUTE>
+          </INSTANCE>
+        </ATTRIBUTE>
+      </INSTANCE>
+    </GLOBALS>
+  </VODML>
+  <RESOURCE>
+    <TABLE ID="_table1">
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM ID="_HhKAdKcKlhfiUsag" name="ra_pnt" datatype="double" value="12.9768538031" unit="deg"/>
+      <PARAM ID="_HwTBlKFGp2MWVh1Q" name="dec_pnt" datatype="double" value="-72.9580158133" unit="deg"/>
+      <!-- Data FIELDs -->
+      <DATA>
+        <FITS extnum="1">
+          <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/position_fk4.dtf"/>
+        </FITS>
+      </DATA>
+    </TABLE>
+  </RESOURCE>
+</VOTABLE>

Added: trunk/projects/dm/CubeDM-1.0/examples/position_icrs.dtf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/position_icrs.dtf	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,8 @@
+#TEXT/DTF
+XTENSION= "TABLE   "          
+HDUNAME = "POSITION_ICRS"          
+EXTNAME = "POSITION_ICRS"          
+RADESYS = "ICRS"
+RA_PNT  = 12.9768538030848     / [deg] Pointing location - RA
+DEC_PNT = -72.9580158132637    / [deg] Pointing location - DEC
+END

Added: trunk/projects/dm/CubeDM-1.0/examples/position_icrs_annotated_byref.vot
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/position_icrs_annotated_byref.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.4_vodml">
+  <VODML>
+    <MODEL>
+      <NAME>coords</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>ivoa</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <GLOBALS ID="Std_Frames">
+      <INSTANCE ID="_ICRS_FRAME" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <LITERAL dmtype="coords:domain.spatial.StdRefFrame" value="ICRS"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Spherical">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_RA_AXIS" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="ra"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
+                  <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="0.0"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
+                  <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="360.0"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+              <INSTANCE ID="_DEC_AXIS" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="dec"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
+                  <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="-90.0"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
+                  <LITERAL dmtype="ivoa:RealQuantity" unit="deg" value="+90.0"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+    </GLOBALS>
+    <GLOBALS>
+      <INSTANCE dmtype="meas:Position2D">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.spatial.SpatialCoord2D">
+            <ATTRIBUTE dmrole="coords:MultiCoordValue.cmpt">
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_RA_AXIS</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+              <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                  <CONSTANT ref="_HwTBlKFGp2MWVh1Q" dmtype="ivoa:RealQuantity"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                  <IDREF>_DEC_AXIS</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+            </ATTRIBUTE>
+          </INSTANCE>
+        </ATTRIBUTE>
+      </INSTANCE>
+    </GLOBALS>
+  </VODML>
+  <RESOURCE>
+    <TABLE ID="_table1">
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM ID="_HhKAdKcKlhfiUsag" name="ra_pnt" datatype="double" value="12.9768538031" unit="deg"/>
+      <PARAM ID="_HwTBlKFGp2MWVh1Q" name="dec_pnt" datatype="double" value="-72.9580158133" unit="deg"/>
+      <!-- Data FIELDs -->
+      <DATA>
+        <FITS extnum="1">
+          <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/position_icrs.dtf"/>
+        </FITS>
+      </DATA>
+    </TABLE>
+  </RESOURCE>
+</VOTABLE>

Added: trunk/projects/dm/CubeDM-1.0/examples/time_date.dtf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/time_date.dtf	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,8 @@
+#TEXT/DTF
+XTENSION= "TABLE   "          
+HDUNAME = "TIME_DATE"          
+EXTNAME = "TIME_DATE"          
+REFPOS  = "TOPOCENTER"
+TIMESYS = "TT"
+DATE-OBS= "2000-09-02T01:10:14"  / Date and time of observation start
+END

Added: trunk/projects/dm/CubeDM-1.0/examples/time_date_annotated_byref.vot
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/time_date_annotated_byref.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.4_vodml">
+  <VODML>
+    <MODEL>
+      <NAME>coords</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>ivoa</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <GLOBALS ID="Std_Frames">
+      <INSTANCE ID="_TT_FRAME" dmtype="coords:domain.temporal.TimeFrame">
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.timescale">
+          <LITERAL dmtype="coords:domain.temporal.TimeScale" value="TT"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.temporal.TimeSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_TT_Time_Axis" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="time"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="0"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+    </GLOBALS>
+    <GLOBALS>
+      <INSTANCE dmtype="meas:TimeMeasure">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.temporal.ISOTime">
+            <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+              <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:datetime"/>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:CoordValue.coordAxis">
+              <IDREF>_TT_Time_Axis</IDREF>
+            </REFERENCE>
+          </INSTANCE>
+        </ATTRIBUTE>
+      </INSTANCE>
+    </GLOBALS>
+  </VODML>
+  <RESOURCE>
+    <TABLE ID="_table1">
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM ID="_HhKAdKcKlhfiUsag" name="date_obs" datatype="char" arraysize="19" value="2000-09-02T01:10:14"/>
+      <!-- Data FIELDs -->
+      <DATA>
+        <FITS extnum="1">
+          <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/time_date.dtf"/>
+        </FITS>
+      </DATA>
+    </TABLE>
+  </RESOURCE>
+</VOTABLE>

Added: trunk/projects/dm/CubeDM-1.0/examples/time_jd.dtf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/time_jd.dtf	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,8 @@
+#TEXT/DTF
+XTENSION= "TABLE   "          
+HDUNAME = "TIME_JD"          
+EXTNAME = "TIME_JD"          
+REFPOS  = "TOPOCENTER"
+TIMESYS = "TT"
+TSTART  = 2450814.52             / [d] Start Time - JD date
+END

Added: trunk/projects/dm/CubeDM-1.0/examples/time_jd_annotated_byref.vot
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/time_jd_annotated_byref.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.4_vodml">
+  <VODML>
+    <MODEL>
+      <NAME>coords</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>ivoa</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <GLOBALS ID="Std_Frames">
+      <INSTANCE ID="_JD_FRAME" dmtype="coords:domain.temporal.TimeFrame">
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.timescale">
+          <LITERAL dmtype="coords:domain.temporal.TimeScale" value="TT"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.temporal.TimeSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_JD_TT_Time_Axis" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="time"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="0"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+    </GLOBALS>
+    <GLOBALS>
+      <INSTANCE dmtype="meas:TimeMeasure">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.temporal.TimeOffset">
+            <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+              <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:CoordValue.coordAxis">
+              <IDREF>_JD_TT_Time_Axis</IDREF>
+            </REFERENCE>
+          </INSTANCE>
+        </ATTRIBUTE>
+      </INSTANCE>
+    </GLOBALS>
+  </VODML>
+  <RESOURCE>
+    <TABLE ID="_table1">
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM ID="_HhKAdKcKlhfiUsag" name="tstart" datatype="double" value="2450814.52" unit="d"/>
+      <!-- Data FIELDs -->
+      <DATA>
+        <FITS extnum="1">
+          <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/time_jd.dtf"/>
+        </FITS>
+      </DATA>
+    </TABLE>
+  </RESOURCE>
+</VOTABLE>

Added: trunk/projects/dm/CubeDM-1.0/examples/time_met.dtf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/time_met.dtf	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,9 @@
+#TEXT/DTF
+XTENSION= "TABLE   "          
+HDUNAME = "TIME_MET"          
+EXTNAME = "TIME_MET"          
+REFPOS  = "TOPOCENTER"
+TIMESYS = "TT"
+MJDREF  = 50814.02               / [d] zero point for times - MJD
+TSTART  = 84244214.7546979934    / [s] Observation start time
+END

Added: trunk/projects/dm/CubeDM-1.0/examples/time_met_annotated_byref.vot
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/time_met_annotated_byref.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.4_vodml">
+  <VODML>
+    <MODEL>
+      <NAME>coords</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>ivoa</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <GLOBALS ID="Std_Frames">
+      <INSTANCE ID="_JD_FRAME" dmtype="coords:domain.temporal.TimeFrame">
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.timescale">
+          <LITERAL dmtype="coords:domain.temporal.TimeScale" value="TT"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.temporal.TimeSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_JD_Time_Axis" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="jd"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="0"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE ID="_MJD_FRAME" dmtype="coords:domain.temporal.TimeFrame">
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.timescale">
+          <LITERAL dmtype="coords:domain.temporal.TimeScale" value="TT"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.time0">
+          <INSTANCE dmtype="coords:domain.temporal.TimeOffset">
+            <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+              <LITERAL dmtype="ivoa:RealQuantity" value="2400000.5"/>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:CoordValue.coordAxis">
+              <IDREF>_JD_Time_Axis</IDREF>
+            </REFERENCE>
+          </INSTANCE>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.temporal.TimeSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_MJD_Time_Axis" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="mjd"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="0"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+    </GLOBALS>
+    <GLOBALS>
+      <INSTANCE dmtype="coords:domain.temporal.TimeFrame">
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.timescale">
+          <LITERAL dmtype="coords:domain.temporal.TimeScale" value="TT"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.time0">
+          <INSTANCE dmtype="coords:domain.temporal.TimeOffset">
+            <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+              <CONSTANT ref="_0318HEAjt4qRFTI5" dmtype="ivoa:RealQuantity"/>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:CoordValue.coordAxis">
+              <IDREF>_MJD_Time_Axis</IDREF>
+            </REFERENCE>
+          </INSTANCE>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.temporal.TimeSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_MET_Time_Axis" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="time"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="0"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE dmtype="meas:TimeMeasure">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.temporal.TimeOffset">
+            <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+              <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:CoordValue.coordAxis">
+              <IDREF>_MET_Time_Axis</IDREF>
+            </REFERENCE>
+          </INSTANCE>
+        </ATTRIBUTE>
+      </INSTANCE>
+    </GLOBALS>
+  </VODML>
+  <RESOURCE>
+    <TABLE ID="_table1">
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM ID="_0318HEAjt4qRFTI5" name="mjdref" datatype="double" value="50814.02" unit="d"/>
+      <PARAM ID="_HhKAdKcKlhfiUsag" name="tstart" datatype="double" value="84244214.7547" unit="s"/>
+      <!-- Data FIELDs -->
+      <DATA>
+        <FITS extnum="1">
+          <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/time_met.dtf"/>
+        </FITS>
+      </DATA>
+    </TABLE>
+  </RESOURCE>
+</VOTABLE>

Added: trunk/projects/dm/CubeDM-1.0/examples/time_mjd.dtf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/time_mjd.dtf	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,8 @@
+#TEXT/DTF
+XTENSION= "TABLE   "          
+HDUNAME = "TIME_MJD"          
+EXTNAME = "TIME_MJD"          
+REFPOS  = "TOPOCENTER"
+TIMESYS = "TT"
+MJDREF  = 50814.02               / [d] Time - MJD date
+END

Added: trunk/projects/dm/CubeDM-1.0/examples/time_mjd_annotated_byref.vot
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/time_mjd_annotated_byref.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.4_vodml">
+  <VODML>
+    <MODEL>
+      <NAME>coords</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>ivoa</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <GLOBALS ID="Std_Frames">
+      <INSTANCE ID="_JD_FRAME" dmtype="coords:domain.temporal.TimeFrame">
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.timescale">
+          <LITERAL dmtype="coords:domain.temporal.TimeScale" value="TT"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.temporal.TimeSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_JD_Time_Axis" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="jd"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="0"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE ID="_MJD_FRAME" dmtype="coords:domain.temporal.TimeFrame">
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.timescale">
+          <LITERAL dmtype="coords:domain.temporal.TimeScale" value="TT"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.time0">
+          <INSTANCE dmtype="coords:domain.temporal.TimeOffset">
+            <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+              <LITERAL dmtype="ivoa:RealQuantity" value="2400000.5"/>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:CoordValue.coordAxis">
+              <IDREF>_JD_Time_Axis</IDREF>
+            </REFERENCE>
+          </INSTANCE>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.temporal.TimeSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_MJD_Time_Axis" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <LITERAL dmtype="ivoa:string" value="mjd"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMin">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="0"/>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coords:PhysicalAxis.domainMax">
+                  <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+    </GLOBALS>
+    <GLOBALS>
+      <INSTANCE dmtype="meas:TimeMeasure">
+        <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+          <INSTANCE dmtype="coords:domain.temporal.TimeOffset">
+            <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+              <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:CoordValue.coordAxis">
+              <IDREF>_MJD_Time_Axis</IDREF>
+            </REFERENCE>
+          </INSTANCE>
+        </ATTRIBUTE>
+      </INSTANCE>
+    </GLOBALS>
+  </VODML>
+  <RESOURCE>
+    <TABLE ID="_table1">
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM ID="_HhKAdKcKlhfiUsag" name="tstart" datatype="double" value="50814.02" unit="d"/>
+      <!-- Data FIELDs -->
+      <DATA>
+        <FITS extnum="1">
+          <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/time_mjd.dtf"/>
+        </FITS>
+      </DATA>
+    </TABLE>
+  </RESOURCE>
+</VOTABLE>

Added: trunk/projects/dm/CubeDM-1.0/examples/timeseries_example1.dtf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/timeseries_example1.dtf	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,26 @@
+#TEXT/DTF
+XTENSION= "TABLE   "          
+HDUNAME = "TIMESERIES"          
+EXTNAME = "TIMESERIES"          
+TFIELDS =                    7
+TTYPE1  = "HJD     "           / time
+TFORM1  = "1D      "           / data format of field.
+TUNIT1  = "d       "           / physical unit of field.
+TTYPE2  = "raj2000 "           / RA
+TFORM2  = "1D      "           / data format of field.
+TUNIT2  = "deg     "           / physical unit of field.
+TTYPE3  = "dej2000 "           / DEC
+TFORM3  = "1D      "           / data format of field.
+TUNIT3  = "deg     "           / physical unit of field.
+TTYPE4  = "flx     "           / flux
+TFORM4  = "1E      "           / data format of field.
+TTYPE5  = "flxerr  "           / flux error
+TFORM5  = "1E      "           / data format of field.
+TTYPE6  = "mag     "           / magnitude
+TFORM6  = "1E      "           / data format of field.
+TTYPE7  = "magerr  "           / magnitude error
+TFORM7  = "1E      "           / data format of field.
+DATE    = "2017-03-27T15:35:56" / Date and time of file creation
+END
+
+56287.11921047 12.9768538030848 -72.9580158132637 7.86796e-17 0.0 19.0829 0.0

Added: trunk/projects/dm/CubeDM-1.0/examples/timeseries_example1_annotated_byref.vot
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/CubeDM-1.0/examples/timeseries_example1_annotated_byref.vot	Sat Apr 29 00:32:42 2017	(r3994)
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.4_vodml">
+  <VODML>
+    <MODEL>
+      <NAME>coords</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>cube</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/cube/Cube-1.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>ds</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ds/DatasetMetadata-1.0.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>ivoa</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>meas</NAME>
+      <URL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCMeas-2.0.vo-dml.xml</URL>
+    </MODEL>
+    <GLOBALS>
+      <INSTANCE ID="_01181YWsEJmSbhJP" dmtype="coords:domain.temporal.TimeFrame">
+        <ATTRIBUTE dmrole="coords:domain.temporal.TimeFrame.timescale">
+          <CONSTANT ref="_01182fKnTYv8NLOK" dmtype="coords:domain.temporal.TimeScale"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.temporal.TimeSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0118WLLnSEBj0p46" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <CONSTANT ref="_0118cF2Rm82EU45n" dmtype="ivoa:string"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE ID="_011912XxjJ6d2Yfk" dmtype="coords:domain.spatial.SpaceFrame">
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.spaceRefFrame">
+          <CONSTANT ref="_01191jiJzYdXI6UP" dmtype="coords:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coords:domain.spatial.SpaceFrame.equinox">
+          <INSTANCE dmtype="coords:domain.spatial.Epoch">
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.type">
+              <CONSTANT ref="_0119cfNEHUi0m9rW" dmtype="coords:domain.spatial.EpochType"/>
+            </ATTRIBUTE>
+            <ATTRIBUTE dmrole="coords:domain.spatial.Epoch.year">
+              <CONSTANT ref="_0119cfoOjpZJkO0E" dmtype="ivoa:real"/>
+            </ATTRIBUTE>
+          </INSTANCE>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.spatial.Spherical">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0119Kby9hIzCYJPJ" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <CONSTANT ref="_0119OyyH8HFLPhaO" dmtype="ivoa:string"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+              <INSTANCE ID="_0119W9piipgxj8Lq" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <CONSTANT ref="_0119bl4ryZpLwCUc" dmtype="ivoa:string"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE ID="_01202YWsEJmSbhJP" dmtype="coords:domain.generic.GenericFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.generic.GenericCoordSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0120WLLnSEBj0p46" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <CONSTANT ref="_0120cF2Rm82EU45n" dmtype="ivoa:string"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE ID="_01212YWsEJmSbhJP" dmtype="coords:domain.generic.GenericFrame">
+        <COMPOSITION dmrole="coords:CoordFrame.coordSpace"> 
+          <INSTANCE dmtype="coords:domain.generic.GenericCoordSpace">
+            <COMPOSITION dmrole="coords:CoordSpace.coordAxis"> 
+              <INSTANCE ID="_0121WLLnSEBj0p46" dmtype="coords:PhysicalAxis">
+                <ATTRIBUTE dmrole="coords:Axis.name">
+                  <CONSTANT ref="_0121cF2Rm82EU45n" dmtype="ivoa:string"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION> 
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE dmtype="ds:experiment.ObsDataset">
+        <ATTRIBUTE dmrole="ds:dataset.Dataset.dataProductType">
+          <CONSTANT ref="_07Yrfb1KUNZfOEK8" dmtype="ds:dataset.DataProductType"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="ds:experiment.ObsDataset.calibLevel">
+          <CONSTANT ref="_0GQQpjxvwn9XD0e1" dmtype="ivoa:integer"/>
+        </ATTRIBUTE>
+        <COMPOSITION dmrole="ds:dataset.Dataset.dataID"> 
+          <INSTANCE dmtype="ds:dataset.DataID">
+            <ATTRIBUTE dmrole="ds:dataset.DataID.date">
+              <CONSTANT ref="_3kusBO5Vi7a8i2Bs" dmtype="ivoa:datetime"/>
+            </ATTRIBUTE>
+          </INSTANCE>
+        </COMPOSITION> 
+      </INSTANCE>
+      <INSTANCE dmtype="cube:SparseCube">
+        <COMPOSITION dmrole="cube:DataProduct.coordSys"> 
+          <INSTANCE dmtype="coords:CoordSys">
+            <ATTRIBUTE dmrole="coords:AstroCoordSystem.refPosition">
+              <INSTANCE dmtype="coords:domain.spatial.StdRefLocation">
+                <ATTRIBUTE dmrole="coords:domain.spatial.StdRefLocation.position">
+                  <CONSTANT ref="_0018TZnYKkxxCzyE" dmtype="coords:domain.spatial.StdRefPosition"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.timeFrame">
+              <IDREF>_01181YWsEJmSbhJP</IDREF>
+            </REFERENCE>
+            <REFERENCE dmrole="coords:AstroCoordSystem.spaceFrame">
+              <IDREF>_011912XxjJ6d2Yfk</IDREF>
+            </REFERENCE>
+            <REFERENCE dmrole="coords:CoordSys.genericFrame">
+              <IDREF>_01202YWsEJmSbhJP</IDREF>
+              <IDREF>_01212YWsEJmSbhJP</IDREF>
+            </REFERENCE>
+          </INSTANCE>
+        </COMPOSITION> 
+        <COMPOSITION dmrole="cube:SparseCube.data"> 
+          <EXTINSTANCES>_AK9CaKnrQwqiiyvn3</EXTINSTANCES>
+        </COMPOSITION> 
+      </INSTANCE>
+    </GLOBALS>
+    <TEMPLATES tableref="_table1">
+        <INSTANCE ID="_AK9CaKnrQwqiiyvn3" dmtype="cube:NDPoint">
+          <COMPOSITION dmrole="cube:DataElement.axis"> 
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:TimeMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.temporal.TimeOffset">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                        <COLUMN ref="_col-HJD" dmtype="ivoa:RealQuantity"/>
+                      </ATTRIBUTE>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0118WLLnSEBj0p46</IDREF>
+                      </REFERENCE>
+                    </INSTANCE>
+                  </ATTRIBUTE>
+                </INSTANCE>
+              </COMPOSITION> 
+            </INSTANCE>
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:Position1D">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                        <COLUMN ref="_col-raj2000" dmtype="ivoa:RealQuantity"/>
+                      </ATTRIBUTE>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0119Kby9hIzCYJPJ</IDREF>
+                      </REFERENCE>
+                    </INSTANCE>
+                  </ATTRIBUTE>
+                </INSTANCE>
+              </COMPOSITION> 
+            </INSTANCE>
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="False"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:Position1D">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.spatial.SpatialCoord">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                        <COLUMN ref="_col-dej2000" dmtype="ivoa:RealQuantity"/>
+                      </ATTRIBUTE>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0119W9piipgxj8Lq</IDREF>
+                      </REFERENCE>
+                    </INSTANCE>
+                  </ATTRIBUTE>
+                </INSTANCE>
+              </COMPOSITION> 
+            </INSTANCE>
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="True"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:GenericCoordMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.generic.GenericCoordValue">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                        <COLUMN ref="_col-FLX" dmtype="ivoa:RealQuantity"/>
+                      </ATTRIBUTE>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0120WLLnSEBj0p46</IDREF>
+                      </REFERENCE>
+                    </INSTANCE>
+                  </ATTRIBUTE>
+                  <COMPOSITION dmrole="meas:CoordMeasure.error"> 
+                    <INSTANCE dmtype="meas:BasicError1D">
+                      <ATTRIBUTE dmrole="meas:BasicError1D.statError">
+                        <INSTANCE dmtype="meas:Symmetrical1D">
+                          <ATTRIBUTE dmrole="meas:Symmetrical1D.radius">
+                            <COLUMN ref="_col-FLXERR" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                        </INSTANCE>
+                      </ATTRIBUTE>
+                    </INSTANCE>
+                  </COMPOSITION> 
+                </INSTANCE>
+              </COMPOSITION> 
+            </INSTANCE>
+            <INSTANCE dmtype="cube:Observable">
+              <ATTRIBUTE dmrole="cube:DataAxis.dependent">
+                <LITERAL dmtype="ivoa:boolean" value="True"/>
+              </ATTRIBUTE>
+              <COMPOSITION dmrole="cube:Observable.instance"> 
+                <INSTANCE dmtype="meas:GenericCoordMeasure">
+                  <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
+                    <INSTANCE dmtype="coords:domain.generic.GenericCoordValue">
+                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                        <COLUMN ref="_col-MAG" dmtype="ivoa:RealQuantity"/>
+                      </ATTRIBUTE>
+                      <REFERENCE dmrole="coords:CoordValue.coordAxis">
+                        <IDREF>_0121WLLnSEBj0p46</IDREF>
+                      </REFERENCE>
+                    </INSTANCE>
+                  </ATTRIBUTE>
+                  <COMPOSITION dmrole="meas:CoordMeasure.error"> 
+                    <INSTANCE dmtype="meas:BasicError1D">
+                      <ATTRIBUTE dmrole="meas:BasicError1D.statError">
+                        <INSTANCE dmtype="meas:Symmetrical1D">
+                          <ATTRIBUTE dmrole="meas:Symmetrical1D.radius">
+                            <COLUMN ref="_col-MAGERR" dmtype="ivoa:RealQuantity"/>
+                          </ATTRIBUTE>
+                        </INSTANCE>
+                      </ATTRIBUTE>
+                    </INSTANCE>
+                  </COMPOSITION> 
+                </INSTANCE>
+              </COMPOSITION> 
+            </INSTANCE>
+          </COMPOSITION> 
+        </INSTANCE>
+    </TEMPLATES>
+  </VODML>
+  <RESOURCE>
+    <TABLE ID="_table1">
+      <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
+      <PARAM ID="_01182fKnTYv8NLOK" name="timescale" datatype="char" arraysize="2" value="TT"/>
+      <PARAM ID="_0118cF2Rm82EU45n" name="timeaxis_name" datatype="char" arraysize="4" value="time"/>
+      <PARAM ID="_01191jiJzYdXI6UP" name="space_refframe" datatype="char" arraysize="3" value="FK4"/>
+      <PARAM ID="_0119cfNEHUi0m9rW" name="equinox_type" datatype="char" arraysize="1" value="J"/>
+      <PARAM ID="_0119cfoOjpZJkO0E" name="equinox_year" datatype="double" value="2000.0"/>
+      <PARAM ID="_0119OyyH8HFLPhaO" name="spaceaxis1_name" datatype="char" arraysize="7" value="raj2000"/>
+      <PARAM ID="_0119bl4ryZpLwCUc" name="spaceaxis2_name" datatype="char" arraysize="7" value="dej2000"/>
+      <PARAM ID="_0120cF2Rm82EU45n" name="fluxaxis_name" datatype="char" arraysize="4" value="flux"/>
+      <PARAM ID="_0121cF2Rm82EU45n" name="magaxis_name" datatype="char" arraysize="3" value="mag"/>
+      <PARAM ID="_07Yrfb1KUNZfOEK8" name="dataProductType" datatype="char" arraysize="10" ucd="meta.id" value="TIMESERIES">
+        <DESCRIPTION>Dataset type</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_0GQQpjxvwn9XD0e1" name="calibLevel" datatype="int" ucd="meta.code;obs.calib" value="3">
+        <DESCRIPTION>Calibration level</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_3kusBO5Vi7a8i2Bs" name="date" datatype="char" arraysize="19" ucd="time.epoch;meta.dataset" value="2017-03-27T15:35:56">
+        <DESCRIPTION>Data processing/creation date</DESCRIPTION>
+      </PARAM>
+      <PARAM ID="_0018TZnYKkxxCzyE" name="refpos" datatype="char" arraysize="10" value="TOPOCENTER"/>
+      <!-- Data FIELDs -->
+      <FIELD ID="_col-HJD" name="HJD" datatype="double" ucd="VOX:Image_MJDateObs" unit="d">
+        <DESCRIPTION>Epoch at midpoint of observation in Heliocentric Modified Julian Date</DESCRIPTION>
+      </FIELD>
+      <FIELD ID="_col-raj2000" name="raj2000" datatype="double" ucd="pos.eq.ra;meta.main" unit="deg">
+        <DESCRIPTION>Observed RA of the object</DESCRIPTION>
+      </FIELD>
+      <FIELD ID="_col-dej2000" name="dej2000" datatype="double" ucd="pos.eq.dec;meta.main" unit="deg">
+        <DESCRIPTION>Main value of declination</DESCRIPTION>
+      </FIELD>
+      <FIELD ID="_col-FLX" name="FLX" datatype="double" ucd="phot.flux">
+        <DESCRIPTION>Photon flux</DESCRIPTION>
+      </FIELD>
+      <FIELD ID="_col-FLXERR" name="FLXERR" datatype="double" ucd="stat.error;phot.flux"/>
+      <FIELD ID="_col-MAG" name="MAG" datatype="double" ucd="phot.mag">
+        <DESCRIPTION>Magnitude of the object</DESCRIPTION>
+      </FIELD>
+      <FIELD ID="_col-MAGERR" name="MAGERR" datatype="double" ucd="stat.error;phot.mag"/>
+      <DATA>
+        <FITS extnum="1">
+          <STREAM href="file:///data/vao/staff/mcd/docs/models/dm/CubeDM-1.0/examples/timeseries_example1.dtf"/>
+        </FITS>
+      </DATA>
+    </TABLE>
+  </RESOURCE>
+</VOTABLE>


More information about the Volutecommits mailing list