[Volute] r3995 - in trunk/projects/dm/vo-dml/models/STC2/prototype: coords coordsys

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


Author: mdittmar
Date: Sat Apr 29 00:44:18 2017
New Revision: 3995

Log:
migrate alternate modeling to current, extracting Measurement model

Deleted:
   trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/
Modified:
   trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html
   trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.png
   trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml
   trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml.validation-report.txt

Modified: trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html
==============================================================================
--- trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html	Sat Apr 29 00:32:42 2017	(r3994)
+++ trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.html	Sat Apr 29 00:44:18 2017	(r3995)
@@ -1,12 +1,12 @@
 <html xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1.0">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>STC2 Coordinates Model</title>
+    <title>Astronomical Coordinates and Coordinate Systems</title>
     <link rel="stylesheet" href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa_wg.css" type="text/css">
     <link rel="stylesheet" href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/xmi.css" type="text/css">
   </head>
   <body>
-    <h1>STC2 Coordinates Model</h1>
+    <h1>Astronomical Coordinates and Coordinate Systems</h1>
     <h2><a id="contents" name="contents">Table of Contents</a></h2>
     <div class="head">
       <table class=".toc">
@@ -24,7 +24,63 @@
         </tr>
         <tr>
           <td>2.1.1</td>
-          <td>    <a href="#DerivedCoordinate">objectType:DerivedCoordinate</a></td>
+          <td>    <a href="#AstroCoordSystem">objectType:AstroCoordSystem</a></td>
+        </tr>
+        <tr>
+          <td>2.1.2</td>
+          <td>    <a href="#Axis">objectType:Axis</a></td>
+        </tr>
+        <tr>
+          <td>2.1.3</td>
+          <td>    <a href="#BasicCoordValue">dataType:BasicCoordValue</a></td>
+        </tr>
+        <tr>
+          <td>2.1.4</td>
+          <td>    <a href="#BinnedCoordValue">dataType:BinnedCoordValue</a></td>
+        </tr>
+        <tr>
+          <td>2.1.5</td>
+          <td>    <a href="#CoordFrame">objectType:CoordFrame</a></td>
+        </tr>
+        <tr>
+          <td>2.1.6</td>
+          <td>    <a href="#CoordSpace">objectType:CoordSpace</a></td>
+        </tr>
+        <tr>
+          <td>2.1.7</td>
+          <td>    <a href="#CoordSys">objectType:CoordSys</a></td>
+        </tr>
+        <tr>
+          <td>2.1.8</td>
+          <td>    <a href="#CoordValue">dataType:CoordValue</a></td>
+        </tr>
+        <tr>
+          <td>2.1.9</td>
+          <td>    <a href="#DiscreteAxis">objectType:DiscreteAxis</a></td>
+        </tr>
+        <tr>
+          <td>2.1.10</td>
+          <td>    <a href="#DiscreteCoordValue">dataType:DiscreteCoordValue</a></td>
+        </tr>
+        <tr>
+          <td>2.1.11</td>
+          <td>    <a href="#Handedness">enumeration:Handedness</a></td>
+        </tr>
+        <tr>
+          <td>2.1.12</td>
+          <td>    <a href="#MultiCoordValue">dataType:MultiCoordValue</a></td>
+        </tr>
+        <tr>
+          <td>2.1.13</td>
+          <td>    <a href="#PhysicalAxis">objectType:PhysicalAxis</a></td>
+        </tr>
+        <tr>
+          <td>2.1.14</td>
+          <td>    <a href="#PhysicalCoordValue">dataType:PhysicalCoordValue</a></td>
+        </tr>
+        <tr>
+          <td>2.1.15</td>
+          <td>    <a href="#PixelCoordSystem">objectType:PixelCoordSystem</a></td>
         </tr>
         <tr>
           <td>2.2</td>
@@ -36,283 +92,207 @@
         </tr>
         <tr>
           <td>2.3.1</td>
-          <td>    <a href="#domain.generic.Error">objectType: Error</a></td>
+          <td>    <a href="#domain.generic.GenericCoordSpace">objectType: GenericCoordSpace</a></td>
         </tr>
         <tr>
           <td>2.3.2</td>
-          <td>    <a href="#domain.generic.Measurement">objectType: Measurement</a></td>
+          <td>    <a href="#domain.generic.GenericCoordValue">dataType: GenericCoordValue</a></td>
         </tr>
         <tr>
           <td>2.3.3</td>
-          <td>    <a href="#domain.generic.RandomError">objectType: RandomError</a></td>
-        </tr>
-        <tr>
-          <td>2.3.4</td>
-          <td>    <a href="#domain.generic.Resolution">objectType: Resolution</a></td>
-        </tr>
-        <tr>
-          <td>2.3.5</td>
-          <td>    <a href="#domain.generic.StatisticalError">objectType: StatisticalError</a></td>
-        </tr>
-        <tr>
-          <td>2.3.6</td>
-          <td>    <a href="#domain.generic.SystematicError">objectType: SystematicError</a></td>
+          <td>    <a href="#domain.generic.GenericFrame">objectType: GenericFrame</a></td>
         </tr>
         <tr>
           <td>2.4</td>
-          <td>    <a href="#domain.polarization">package: polarization</a></td>
+          <td>    <a href="#domain.pixel">package: pixel</a></td>
         </tr>
         <tr>
           <td>2.4.1</td>
-          <td>    <a href="#domain.polarization.Circular">objectType: Circular</a></td>
+          <td>    <a href="#domain.pixel.PixelAxis">objectType: PixelAxis</a></td>
         </tr>
         <tr>
           <td>2.4.2</td>
-          <td>    <a href="#domain.polarization.DerivedPolarizationCoordinate">objectType: DerivedPolarizationCoordinate</a></td>
+          <td>    <a href="#domain.pixel.PixelFrame">objectType: PixelFrame</a></td>
         </tr>
         <tr>
           <td>2.4.3</td>
-          <td>    <a href="#domain.polarization.Linear">objectType: Linear</a></td>
+          <td>    <a href="#domain.pixel.PixelIndex">dataType: PixelIndex</a></td>
         </tr>
         <tr>
           <td>2.4.4</td>
-          <td>    <a href="#domain.polarization.Stokes">objectType: Stokes</a></td>
-        </tr>
-        <tr>
-          <td>2.4.5</td>
-          <td>    <a href="#domain.polarization.Vector">objectType: Vector</a></td>
+          <td>    <a href="#domain.pixel.PixelSpace">objectType: PixelSpace</a></td>
         </tr>
         <tr>
           <td>2.5</td>
-          <td>    <a href="#domain.spatial">package: spatial</a></td>
+          <td>    <a href="#domain.polarization">package: polarization</a></td>
         </tr>
         <tr>
           <td>2.5.1</td>
-          <td>    <a href="#domain.spatial.Error1D">objectType: Error1D</a></td>
+          <td>    <a href="#domain.polarization.PolCircular">dataType: PolCircular</a></td>
         </tr>
         <tr>
           <td>2.5.2</td>
-          <td>    <a href="#domain.spatial.Error2D">objectType: Error2D</a></td>
+          <td>    <a href="#domain.polarization.PolCircularEnum">enumeration: PolCircularEnum</a></td>
         </tr>
         <tr>
           <td>2.5.3</td>
-          <td>    <a href="#domain.spatial.Error3D">objectType: Error3D</a></td>
+          <td>    <a href="#domain.polarization.PolCoordValue">dataType: PolCoordValue</a></td>
         </tr>
         <tr>
           <td>2.5.4</td>
-          <td>    <a href="#domain.spatial.Position">objectType: Position</a></td>
+          <td>    <a href="#domain.polarization.PolLinear">dataType: PolLinear</a></td>
         </tr>
         <tr>
           <td>2.5.5</td>
-          <td>    <a href="#domain.spatial.Position1D">objectType: Position1D</a></td>
+          <td>    <a href="#domain.polarization.PolLinearEnum">enumeration: PolLinearEnum</a></td>
         </tr>
         <tr>
           <td>2.5.6</td>
-          <td>    <a href="#domain.spatial.Position2D">objectType: Position2D</a></td>
+          <td>    <a href="#domain.polarization.PolStokes">dataType: PolStokes</a></td>
         </tr>
         <tr>
           <td>2.5.7</td>
-          <td>    <a href="#domain.spatial.Position3D">objectType: Position3D</a></td>
+          <td>    <a href="#domain.polarization.PolStokesEnum">enumeration: PolStokesEnum</a></td>
         </tr>
         <tr>
           <td>2.5.8</td>
-          <td>    <a href="#domain.spatial.RandomError1D">objectType: RandomError1D</a></td>
+          <td>    <a href="#domain.polarization.PolVector">dataType: PolVector</a></td>
         </tr>
         <tr>
           <td>2.5.9</td>
-          <td>    <a href="#domain.spatial.RandomError2D">objectType: RandomError2D</a></td>
+          <td>    <a href="#domain.polarization.PolVectorEnum">enumeration: PolVectorEnum</a></td>
         </tr>
         <tr>
           <td>2.5.10</td>
-          <td>    <a href="#domain.spatial.RandomError3D">objectType: RandomError3D</a></td>
+          <td>    <a href="#domain.polarization.PolarizationFrame">objectType: PolarizationFrame</a></td>
         </tr>
         <tr>
           <td>2.5.11</td>
-          <td>    <a href="#domain.spatial.Resolution1D">objectType: Resolution1D</a></td>
-        </tr>
-        <tr>
-          <td>2.5.12</td>
-          <td>    <a href="#domain.spatial.Resolution2D">objectType: Resolution2D</a></td>
+          <td>    <a href="#domain.polarization.PolarizationSpace">objectType: PolarizationSpace</a></td>
         </tr>
         <tr>
-          <td>2.5.13</td>
-          <td>    <a href="#domain.spatial.Resolution3D">objectType: Resolution3D</a></td>
+          <td>2.6</td>
+          <td>    <a href="#domain.spatial">package: spatial</a></td>
         </tr>
         <tr>
-          <td>2.5.14</td>
-          <td>    <a href="#domain.spatial.StatisticalError1D">objectType: StatisticalError1D</a></td>
+          <td>2.6.1</td>
+          <td>    <a href="#domain.spatial.Cartesian">objectType: Cartesian</a></td>
         </tr>
         <tr>
-          <td>2.5.15</td>
-          <td>    <a href="#domain.spatial.StatisticalError2D">objectType: StatisticalError2D</a></td>
+          <td>2.6.2</td>
+          <td>    <a href="#domain.spatial.CustomRefLocation">dataType: CustomRefLocation</a></td>
         </tr>
         <tr>
-          <td>2.5.16</td>
-          <td>    <a href="#domain.spatial.StatisticalError3D">objectType: StatisticalError3D</a></td>
+          <td>2.6.3</td>
+          <td>    <a href="#domain.spatial.Epoch">dataType: Epoch</a></td>
         </tr>
         <tr>
-          <td>2.5.17</td>
-          <td>    <a href="#domain.spatial.SystematicError1D">objectType: SystematicError1D</a></td>
+          <td>2.6.4</td>
+          <td>    <a href="#domain.spatial.EpochType">enumeration: EpochType</a></td>
         </tr>
         <tr>
-          <td>2.5.18</td>
-          <td>    <a href="#domain.spatial.SystematicError2D">objectType: SystematicError2D</a></td>
+          <td>2.6.5</td>
+          <td>    <a href="#domain.spatial.RefLocation">dataType: RefLocation</a></td>
         </tr>
         <tr>
-          <td>2.5.19</td>
-          <td>    <a href="#domain.spatial.SystematicError3D">objectType: SystematicError3D</a></td>
+          <td>2.6.6</td>
+          <td>    <a href="#domain.spatial.SpaceFrame">objectType: SpaceFrame</a></td>
         </tr>
         <tr>
-          <td>2.6</td>
-          <td>    <a href="#domain.spectral">package: spectral</a></td>
+          <td>2.6.7</td>
+          <td>    <a href="#domain.spatial.SpatialCoord">dataType: SpatialCoord</a></td>
         </tr>
         <tr>
-          <td>2.6.1</td>
-          <td>    <a href="#domain.spectral.DerivedSpectralCoordinate">objectType: DerivedSpectralCoordinate</a></td>
+          <td>2.6.8</td>
+          <td>    <a href="#domain.spatial.SpatialCoord1D">dataType: SpatialCoord1D</a></td>
         </tr>
         <tr>
-          <td>2.6.2</td>
-          <td>    <a href="#domain.spectral.Energy">objectType: Energy</a></td>
+          <td>2.6.9</td>
+          <td>    <a href="#domain.spatial.SpatialCoord2D">dataType: SpatialCoord2D</a></td>
         </tr>
         <tr>
-          <td>2.6.3</td>
-          <td>    <a href="#domain.spectral.Error">objectType: Error</a></td>
+          <td>2.6.10</td>
+          <td>    <a href="#domain.spatial.SpatialCoord3D">dataType: SpatialCoord3D</a></td>
         </tr>
         <tr>
-          <td>2.6.4</td>
-          <td>    <a href="#domain.spectral.Frequency">objectType: Frequency</a></td>
+          <td>2.6.11</td>
+          <td>    <a href="#domain.spatial.SpatialCoordValue">dataType: SpatialCoordValue</a></td>
         </tr>
         <tr>
-          <td>2.6.5</td>
-          <td>    <a href="#domain.spectral.RandomError">objectType: RandomError</a></td>
+          <td>2.6.12</td>
+          <td>    <a href="#domain.spatial.SpatialSpace">objectType: SpatialSpace</a></td>
         </tr>
         <tr>
-          <td>2.6.6</td>
-          <td>    <a href="#domain.spectral.Resolution">objectType: Resolution</a></td>
+          <td>2.6.13</td>
+          <td>    <a href="#domain.spatial.Spherical">objectType: Spherical</a></td>
         </tr>
         <tr>
-          <td>2.6.7</td>
-          <td>    <a href="#domain.spectral.StatisticalError">objectType: StatisticalError</a></td>
+          <td>2.6.14</td>
+          <td>    <a href="#domain.spatial.StdRefFrame">enumeration: StdRefFrame</a></td>
         </tr>
         <tr>
-          <td>2.6.8</td>
-          <td>    <a href="#domain.spectral.SystematicError">objectType: SystematicError</a></td>
+          <td>2.6.15</td>
+          <td>    <a href="#domain.spatial.StdRefLocation">dataType: StdRefLocation</a></td>
         </tr>
         <tr>
-          <td>2.6.9</td>
-          <td>    <a href="#domain.spectral.Wavelength">objectType: Wavelength</a></td>
+          <td>2.6.16</td>
+          <td>    <a href="#domain.spatial.StdRefPosition">enumeration: StdRefPosition</a></td>
         </tr>
         <tr>
           <td>2.7</td>
-          <td>    <a href="#domain.temporal">package: temporal</a></td>
+          <td>    <a href="#domain.spectral">package: spectral</a></td>
         </tr>
         <tr>
           <td>2.7.1</td>
-          <td>    <a href="#domain.temporal.Error">objectType: Error</a></td>
+          <td>    <a href="#domain.spectral.Energy">primitiveType: Energy</a></td>
         </tr>
         <tr>
           <td>2.7.2</td>
-          <td>    <a href="#domain.temporal.RandomError">objectType: RandomError</a></td>
+          <td>    <a href="#domain.spectral.Frequency">primitiveType: Frequency</a></td>
         </tr>
         <tr>
           <td>2.7.3</td>
-          <td>    <a href="#domain.temporal.Resolution">objectType: Resolution</a></td>
+          <td>    <a href="#domain.spectral.SpectralFrame">objectType: SpectralFrame</a></td>
         </tr>
         <tr>
           <td>2.7.4</td>
-          <td>    <a href="#domain.temporal.StatisticalError">objectType: StatisticalError</a></td>
+          <td>    <a href="#domain.spectral.SpectralSpace">objectType: SpectralSpace</a></td>
         </tr>
         <tr>
           <td>2.7.5</td>
-          <td>    <a href="#domain.temporal.SystematicError">objectType: SystematicError</a></td>
+          <td>    <a href="#domain.spectral.SpectralValue">dataType: SpectralValue</a></td>
         </tr>
         <tr>
           <td>2.7.6</td>
-          <td>    <a href="#domain.temporal.Time">objectType: Time</a></td>
+          <td>    <a href="#domain.spectral.Wavelength">primitiveType: Wavelength</a></td>
         </tr>
         <tr>
           <td>2.8</td>
-          <td>    <a href="#dtypes">package: dtypes</a></td>
+          <td>    <a href="#domain.temporal">package: temporal</a></td>
         </tr>
         <tr>
           <td>2.8.1</td>
-          <td>    <a href="#dtypes.Asymmetrical1D">dataType: Asymmetrical1D</a></td>
+          <td>    <a href="#domain.temporal.ISOTime">dataType: ISOTime</a></td>
         </tr>
         <tr>
           <td>2.8.2</td>
-          <td>    <a href="#dtypes.Asymmetrical2D">dataType: Asymmetrical2D</a></td>
+          <td>    <a href="#domain.temporal.TimeFrame">objectType: TimeFrame</a></td>
         </tr>
         <tr>
           <td>2.8.3</td>
-          <td>    <a href="#dtypes.Asymmetrical3D">dataType: Asymmetrical3D</a></td>
+          <td>    <a href="#domain.temporal.TimeOffset">dataType: TimeOffset</a></td>
         </tr>
         <tr>
           <td>2.8.4</td>
-          <td>    <a href="#dtypes.Bounds1D">dataType: Bounds1D</a></td>
+          <td>    <a href="#domain.temporal.TimeScale">enumeration: TimeScale</a></td>
         </tr>
         <tr>
           <td>2.8.5</td>
-          <td>    <a href="#dtypes.Bounds2D">dataType: Bounds2D</a></td>
+          <td>    <a href="#domain.temporal.TimeSpace">objectType: TimeSpace</a></td>
         </tr>
         <tr>
           <td>2.8.6</td>
-          <td>    <a href="#dtypes.Bounds3D">dataType: Bounds3D</a></td>
-        </tr>
-        <tr>
-          <td>2.8.7</td>
-          <td>    <a href="#dtypes.CovarianceMatrix2D">dataType: CovarianceMatrix2D</a></td>
-        </tr>
-        <tr>
-          <td>2.8.8</td>
-          <td>    <a href="#dtypes.CovarianceMatrix3D">dataType: CovarianceMatrix3D</a></td>
-        </tr>
-        <tr>
-          <td>2.8.9</td>
-          <td>    <a href="#dtypes.Ellipse">dataType: Ellipse</a></td>
-        </tr>
-        <tr>
-          <td>2.8.10</td>
-          <td>    <a href="#dtypes.Ellipsoid">dataType: Ellipsoid</a></td>
-        </tr>
-        <tr>
-          <td>2.8.11</td>
-          <td>    <a href="#dtypes.Matrix">dataType: Matrix</a></td>
-        </tr>
-        <tr>
-          <td>2.8.12</td>
-          <td>    <a href="#dtypes.Matrix2x2">dataType: Matrix2x2</a></td>
-        </tr>
-        <tr>
-          <td>2.8.13</td>
-          <td>    <a href="#dtypes.Matrix3x3">dataType: Matrix3x3</a></td>
-        </tr>
-        <tr>
-          <td>2.8.14</td>
-          <td>    <a href="#dtypes.Symmetrical1D">dataType: Symmetrical1D</a></td>
-        </tr>
-        <tr>
-          <td>2.8.15</td>
-          <td>    <a href="#dtypes.Symmetrical2D">dataType: Symmetrical2D</a></td>
-        </tr>
-        <tr>
-          <td>2.8.16</td>
-          <td>    <a href="#dtypes.Symmetrical3D">dataType: Symmetrical3D</a></td>
-        </tr>
-        <tr>
-          <td>2.8.17</td>
-          <td>    <a href="#dtypes.Uncertainty">dataType: Uncertainty</a></td>
-        </tr>
-        <tr>
-          <td>2.8.18</td>
-          <td>    <a href="#dtypes.Uncertainty1D">dataType: Uncertainty1D</a></td>
-        </tr>
-        <tr>
-          <td>2.8.19</td>
-          <td>    <a href="#dtypes.Uncertainty2D">dataType: Uncertainty2D</a></td>
-        </tr>
-        <tr>
-          <td>2.8.20</td>
-          <td>    <a href="#dtypes.Uncertainty3D">dataType: Uncertainty3D</a></td>
+          <td>    <a href="#domain.temporal.TimeStamp">dataType: TimeStamp</a></td>
         </tr>
         <tr>
           <td>3.</td>
@@ -327,17 +307,12 @@
         <tr>
           <td>4.1</td>
           <td>
-                <a href="#coordsys">coordsys</a></td>
-        </tr>
-        <tr>
-          <td>4.2</td>
-          <td>
                 <a href="#ivoa">ivoa</a></td>
         </tr>
       </table>
     </div>
     <hr>
-    <h1><a name="model_section">1. Model: STC2 Coordinates Model (coords)</a></h1>
+    <h1><a name="model_section">1. Model: Astronomical Coordinates and Coordinate Systems (coords)</a></h1>
     <table>
       <tr>
         <td align="right"><b>Authors</b></td>
@@ -347,7 +322,7 @@
       <tr>
         <td align="right"><b>Date</b></td>
         <td> : </td>
-        <td>2017-03-09T11:53:40</td>
+        <td>2017-04-28T11:20:22</td>
       </tr>
       <tr>
         <td align="right"><b>Version</b></td>
@@ -362,8 +337,11 @@
       <tr>
         <td align="right" valign="top"><b>Abstract</b></td>
         <td valign="top"> : </td>
-        <td>
-          TODO : Missing description : please, update your UML model asap.
+        <td>The coordsys model defines a pattern for Coordinate Frame specifications, various Coordinate System objects for bundling Coordinate
+          Frames into associated groups, and implements the CoordFrame pattern for several physical domains.  The expectation is that
+          as models are created which touch on domains not represented here, they will implement this pattern in the same fashion for
+          the new domain.  This implementation may reside in the other model, or be added to this list of implementations.  Models which
+          refer to the CoordFrame of this model are stating an expectation that the instances included follow the specified pattern.
           
         </td>
       </tr>
@@ -380,79 +358,74 @@
         <td colspan="3"></td>
       </tr>
     </table><img src="STCCoords-2.0.png" usemap="#GVmap"><map id="GVmap" name="GVmap">
-<area shape="rect" id="node2" href="#domain" title="domain" alt="" coords="123,109,200,157"/>
-<area shape="rect" id="node4" href="#domain.generic" title="generic" alt="" coords="661,109,736,157"/>
-<area shape="rect" id="node5" href="#domain.spatial" title="spatial" alt="" coords="565,109,637,157"/>
-<area shape="rect" id="node6" href="#domain.spectral" title="spectral" alt="" coords="464,109,541,157"/>
-<area shape="rect" id="node7" href="#domain.temporal" title="temporal" alt="" coords="355,109,440,157"/>
-<area shape="rect" id="node8" href="#domain.polarization" title="polarization" alt="" coords="224,109,331,157"/>
-<area shape="rect" id="node9" href="#dtypes" title="dtypes" alt="" coords="27,109,99,157"/>
-<area shape="rect" id="node10" href="#DerivedCoordinate" title="{DerivedCoordinate}" alt="" coords="4068,403,4172,453"/>
-<area shape="rect" id="node11" href="#domain.generic.Measurement" title="{domain/generic/Measurement|+coord : coordsys:domain.generic.GenericCoord\l}" alt="" coords="3155,286,3384,335"/>
-<area shape="rect" id="node12" href="#domain.generic.Error" title="{domain/generic/Error}" alt="" coords="845,403,960,453"/>
-<area shape="rect" id="node13" href="#domain.generic.StatisticalError" title="{domain/generic/StatisticalError|+statError : coords:dtypes.Uncertainty1D\l}" alt="" coords="580,286,780,335"/>
-<area shape="rect" id="node14" href="#domain.generic.SystematicError" title="{domain/generic/SystematicError|+sysError : coords:dtypes.Uncertainty1D\l}" alt="" coords="804,286,1001,335"/>
-<area shape="rect" id="node15" href="#domain.generic.RandomError" title="{domain/generic/RandomError|+randError : coords:dtypes.Uncertainty1D\l}" alt="" coords="1025,286,1231,335"/>
-<area shape="rect" id="node16" href="#domain.generic.Resolution" title="{domain/generic/Resolution|+res : coords:dtypes.Uncertainty1D\l}" alt="" coords="383,286,556,335"/>
-<area shape="rect" id="node17" href="#domain.spatial.Position" title="{domain/spatial/Position}" alt="" coords="3629,286,3749,335"/>
-<area shape="rect" id="node18" href="#domain.spatial.Position1D" title="{domain/spatial/Position1D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="2733,109,2955,158"/>
-<area shape="rect" id="node21" href="#domain.spatial.Error1D" title="{domain/spatial/Error1D}" alt="" coords="1452,286,1575,335"/>
-<area shape="rect" id="node19" href="#domain.spatial.Position2D" title="{domain/spatial/Position2D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="3405,109,3627,158"/>
-<area shape="rect" id="node26" href="#domain.spatial.Error2D" title="{domain/spatial/Error2D}" alt="" coords="2217,286,2340,335"/>
-<area shape="rect" id="node20" href="#domain.spatial.Position3D" title="{domain/spatial/Position3D|+coord : coordsys:domain.spatial.SpatialCoord\l}" alt="" coords="4205,109,4427,158"/>
-<area shape="rect" id="node31" href="#domain.spatial.Error3D" title="{domain/spatial/Error3D}" alt="" coords="3008,286,3131,335"/>
-<area shape="rect" id="node22" href="#domain.spatial.StatisticalError1D" title="{domain/spatial/StatisticalError1D|+statError : coords:dtypes.Uncertainty1D\l}" alt="" coords="965,109,1165,158"/>
-<area shape="rect" id="node23" href="#domain.spatial.SystematicError1D" title="{domain/spatial/SystematicError1D|+sysError : coords:dtypes.Uncertainty1D\l}" alt="" coords="1189,109,1387,158"/>
-<area shape="rect" id="node24" href="#domain.spatial.RandomError1D" title="{domain/spatial/RandomError1D|+randError : coords:dtypes.Uncertainty1D\l}" alt="" coords="1411,109,1616,158"/>
-<area shape="rect" id="node25" href="#domain.spatial.Resolution1D" title="{domain/spatial/Resolution1D|+res : coords:dtypes.Uncertainty1D\l}" alt="" coords="768,109,941,158"/>
-<area shape="rect" id="node27" href="#domain.spatial.StatisticalError2D" title="{domain/spatial/StatisticalError2D|+statError : coords:dtypes.Uncertainty2D\l}" alt="" coords="2067,109,2267,158"/>
-<area shape="rect" id="node28" href="#domain.spatial.SystematicError2D" title="{domain/spatial/SystematicError2D|+sysError : coords:dtypes.Uncertainty2D\l}" alt="" coords="2291,109,2488,158"/>
-<area shape="rect" id="node29" href="#domain.spatial.RandomError2D" title="{domain/spatial/RandomError2D|+randError : coords:dtypes.Uncertainty2D\l}" alt="" coords="1640,109,1845,158"/>
-<area shape="rect" id="node30" href="#domain.spatial.Resolution2D" title="{domain/spatial/Resolution2D|+res : coords:dtypes.Uncertainty2D\l}" alt="" coords="1869,109,2043,158"/>
-<area shape="rect" id="node32" href="#domain.spatial.StatisticalError3D" title="{domain/spatial/StatisticalError3D|+statError : coords:dtypes.Uncertainty3D\l}" alt="" coords="3651,109,3851,158"/>
-<area shape="rect" id="node33" href="#domain.spatial.SystematicError3D" title="{domain/spatial/SystematicError3D|+sysError : coords:dtypes.Uncertainty3D\l}" alt="" coords="2512,109,2709,158"/>
-<area shape="rect" id="node34" href="#domain.spatial.RandomError3D" title="{domain/spatial/RandomError3D|+randError : coords:dtypes.Uncertainty3D\l}" alt="" coords="2979,109,3184,158"/>
-<area shape="rect" id="node35" href="#domain.spatial.Resolution3D" title="{domain/spatial/Resolution3D|+res : coords:dtypes.Uncertainty3D\l}" alt="" coords="3208,109,3381,158"/>
-<area shape="rect" id="node36" href="#domain.spectral.DerivedSpectralCoordinate" title="{domain/spectral/DerivedSpectralCoordinate|+coord : coordsys:domain.spectral.SpectralCoord\l}" alt="" coords="4003,286,4237,335"/>
-<area shape="rect" id="node40" href="#domain.spectral.Error" title="{domain/spectral/Error}" alt="" coords="3448,403,3565,453"/>
-<area shape="rect" id="node37" href="#domain.spectral.Energy" title="{domain/spectral/Energy}" alt="" coords="4451,109,4573,158"/>
-<area shape="rect" id="node38" href="#domain.spectral.Frequency" title="{domain/spectral/Frequency}" alt="" coords="3875,109,4013,158"/>
-<area shape="rect" id="node39" href="#domain.spectral.Wavelength" title="{domain/spectral/Wavelength}" alt="" coords="4037,109,4181,158"/>
-<area shape="rect" id="node41" href="#domain.spectral.StatisticalError" title="{domain/spectral/StatisticalError|+statError : coords:dtypes.Uncertainty1D\l}" alt="" coords="1993,286,2193,335"/>
-<area shape="rect" id="node42" href="#domain.spectral.SystematicError" title="{domain/spectral/SystematicError|+sysError : coords:dtypes.Uncertainty1D\l}" alt="" coords="3408,286,3605,335"/>
-<area shape="rect" id="node43" href="#domain.spectral.RandomError" title="{domain/spectral/RandomError|+randError : coords:dtypes.Uncertainty1D\l}" alt="" coords="3773,286,3979,335"/>
-<area shape="rect" id="node44" href="#domain.spectral.Resolution" title="{domain/spectral/Resolution|+res : coords:dtypes.Uncertainty1D\l}" alt="" coords="1255,286,1428,335"/>
-<area shape="rect" id="node45" href="#domain.temporal.Time" title="{domain/temporal/Time|+coord : coordsys:domain.temporal.TimeCoord\l}" alt="" coords="4381,286,4605,335"/>
-<area shape="rect" id="node46" href="#domain.temporal.Error" title="{domain/temporal/Error}" alt="" coords="5280,403,5400,453"/>
-<area shape="rect" id="node47" href="#domain.temporal.StatisticalError" title="{domain/temporal/StatisticalError|+statError : coords:dtypes.Uncertainty1D\l}" alt="" coords="5017,286,5217,335"/>
-<area shape="rect" id="node48" href="#domain.temporal.SystematicError" title="{domain/temporal/SystematicError|+sysError : coords:dtypes.Uncertainty1D\l}" alt="" coords="5241,286,5439,335"/>
-<area shape="rect" id="node49" href="#domain.temporal.RandomError" title="{domain/temporal/RandomError|+randError : coords:dtypes.Uncertainty1D\l}" alt="" coords="5463,286,5668,335"/>
-<area shape="rect" id="node50" href="#domain.temporal.Resolution" title="{domain/temporal/Resolution|+res : coords:dtypes.Uncertainty1D\l}" alt="" coords="5692,286,5865,335"/>
-<area shape="rect" id="node51" href="#domain.polarization.DerivedPolarizationCoordinate" title="{domain/polarization/DerivedPolarizationCoordinate}" alt="" coords="4751,286,4993,335"/>
-<area shape="rect" id="node52" href="#domain.polarization.Stokes" title="{domain/polarization/Stokes|+coord : coordsys:domain.polarization.PolStokesCoord\l}" alt="" coords="5451,109,5707,158"/>
-<area shape="rect" id="node53" href="#domain.polarization.Circular" title="{domain/polarization/Circular|+coord : coordsys:domain.polarization.PolCircularCoord\l}" alt="" coords="4597,109,4861,158"/>
-<area shape="rect" id="node54" href="#domain.polarization.Linear" title="{domain/polarization/Linear|+coord : coordsys:domain.polarization.PolLinearCoord\l}" alt="" coords="4885,109,5144,158"/>
-<area shape="rect" id="node55" href="#domain.polarization.Vector" title="{domain/polarization/Vector|+coord : coordsys:domain.polarization.PolVectorCoord\l}" alt="" coords="5168,109,5427,158"/>
-<area shape="rect" id="node56" href="#dtypes.Uncertainty" title="{<<datatype>>\ndtypes/Uncertainty}" alt="" coords="6580,403,6681,453"/>
-<area shape="rect" id="node57" href="#dtypes.Uncertainty1D" title="{<<datatype>>\ndtypes/Uncertainty1D}" alt="" coords="5992,286,6107,335"/>
-<area shape="rect" id="node58" href="#dtypes.Uncertainty2D" title="{<<datatype>>\ndtypes/Uncertainty2D}" alt="" coords="6573,286,6688,335"/>
-<area shape="rect" id="node59" href="#dtypes.Uncertainty3D" title="{<<datatype>>\ndtypes/Uncertainty3D}" alt="" coords="7363,286,7477,335"/>
-<area shape="rect" id="node60" href="#dtypes.Symmetrical1D" title="{<<datatype>>\ndtypes/Symmetrical1D|+radius : ivoa:RealQuantity\l}" alt="" coords="5731,102,5872,165"/>
-<area shape="rect" id="node61" href="#dtypes.Asymmetrical1D" title="{<<datatype>>\ndtypes/Asymmetrical1D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="5896,95,6035,171"/>
-<area shape="rect" id="node62" href="#dtypes.Bounds1D" title="{<<datatype>>\ndtypes/Bounds1D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}" alt="" coords="6059,95,6205,171"/>
-<area shape="rect" id="node63" href="#dtypes.Symmetrical2D" title="{<<datatype>>\ndtypes/Symmetrical2D|+radius : ivoa:RealQuantity\l}" alt="" coords="6229,102,6371,165"/>
-<area shape="rect" id="node64" href="#dtypes.Asymmetrical2D" title="{<<datatype>>\ndtypes/Asymmetrical2D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="6395,95,6533,171"/>
-<area shape="rect" id="node65" href="#dtypes.Bounds2D" title="{<<datatype>>\ndtypes/Bounds2D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}" alt="" coords="6557,95,6704,171"/>
-<area shape="rect" id="node66" href="#dtypes.Symmetrical3D" title="{<<datatype>>\ndtypes/Symmetrical3D|+radius : ivoa:RealQuantity\l}" alt="" coords="7101,102,7243,165"/>
-<area shape="rect" id="node67" href="#dtypes.Asymmetrical3D" title="{<<datatype>>\ndtypes/Asymmetrical3D|+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="7267,95,7405,171"/>
-<area shape="rect" id="node68" href="#dtypes.Bounds3D" title="{<<datatype>>\ndtypes/Bounds3D|+loLimit : ivoa:RealQuantity\l+hiLimit : ivoa:RealQuantity\l}" alt="" coords="7429,95,7576,171"/>
-<area shape="rect" id="node69" href="#dtypes.Ellipse" title="{<<datatype>>\ndtypes/Ellipse|+semiAxis : ivoa:RealQuantity\l+posAngle : ivoa:RealQuantity\l}" alt="" coords="6728,95,6883,171"/>
-<area shape="rect" id="node70" href="#dtypes.Ellipsoid" title="{<<datatype>>\ndtypes/Ellipsoid|+semiAxis : ivoa:RealQuantity\l+posAngle : ivoa:RealQuantity\l}" alt="" coords="7600,95,7755,171"/>
-<area shape="rect" id="node71" href="#dtypes.Matrix" title="{<<datatype>>\ndtypes/Matrix}" alt="" coords="8040,286,8123,335"/>
-<area shape="rect" id="node72" href="#dtypes.Matrix2x2" title="{<<datatype>>\ndtypes/Matrix2x2|+m11 : ivoa:real\l+m12 : ivoa:real\l+m21 : ivoa:real\l+m22 : ivoa:real\l}" alt="" coords="7973,82,8069,185"/>
-<area shape="rect" id="node73" href="#dtypes.Matrix3x3" title="{<<datatype>>\ndtypes/Matrix3x3|+m11 : ivoa:real\l+m12 : ivoa:real\l+m13 : ivoa:real\l+m21 : ivoa:real\l+m22 : ivoa:real\l+m23 : ivoa:real\l+m31 : ivoa:real\l+m32 : ivoa:real\l+m33 : ivoa:real\l}" alt="" coords="8093,49,8189,218"/>
-<area shape="rect" id="node74" href="#dtypes.CovarianceMatrix2D" title="{<<datatype>>\ndtypes/CovarianceMatrix2D|+matrix : coords:dtypes.Matrix2x2\l}" alt="" coords="6907,102,7077,165"/>
-<area shape="rect" id="node75" href="#dtypes.CovarianceMatrix3D" title="{<<datatype>>\ndtypes/CovarianceMatrix3D|+matrix : coords:dtypes.Matrix3x3\l}" alt="" coords="7779,102,7949,165"/>
+<area shape="rect" id="node2" href="#domain" title="domain" alt="" coords="27,273,104,321"/>
+<area shape="rect" id="node4" href="#domain.pixel" title="pixel" alt="" coords="664,273,736,321"/>
+<area shape="rect" id="node5" href="#domain.generic" title="generic" alt="" coords="565,273,640,321"/>
+<area shape="rect" id="node6" href="#domain.spatial" title="spatial" alt="" coords="469,273,541,321"/>
+<area shape="rect" id="node7" href="#domain.spectral" title="spectral" alt="" coords="368,273,445,321"/>
+<area shape="rect" id="node8" href="#domain.temporal" title="temporal" alt="" coords="259,273,344,321"/>
+<area shape="rect" id="node9" href="#domain.polarization" title="polarization" alt="" coords="128,273,235,321"/>
+<area shape="rect" id="node10" href="#Handedness" title="{<<enumeration>>\lHandedness|+left\l+right\l}" alt="" coords="768,259,867,335"/>
+<area shape="rect" id="node11" href="#BasicCoordValue" title="{<<datatype>>\nBasicCoordValue}" alt="" coords="2523,1177,2621,1226"/>
+<area shape="rect" id="node12" href="#CoordValue" title="{<<datatype>>\nCoordValue}" alt="" coords="2452,1046,2535,1095"/>
+<area shape="rect" id="node22" href="#Axis" title="{Axis|+name : ivoa:string\l}" alt="" coords="1943,1177,2047,1226"/>
+<area shape="rect" id="node13" href="#MultiCoordValue" title="{<<datatype>>\nMultiCoordValue|+cmpt : coords:CoordValue\l}" alt="" coords="2581,1039,2723,1102"/>
+<area shape="rect" id="node14" href="#PhysicalCoordValue" title="{<<datatype>>\nPhysicalCoordValue|+cval : ivoa:Quantity\l}" alt="" coords="2111,902,2223,965"/>
+<area shape="rect" id="node15" href="#BinnedCoordValue" title="{<<datatype>>\nBinnedCoordValue|+cval : ivoa:integer\l}" alt="" coords="2440,902,2547,965"/>
+<area shape="rect" id="node16" href="#DiscreteCoordValue" title="{<<datatype>>\nDiscreteCoordValue}" alt="" coords="2597,909,2707,958"/>
+<area shape="rect" id="node17" href="#CoordFrame" title="{CoordFrame}" alt="" coords="895,909,969,958"/>
+<area shape="rect" id="node21" href="#CoordSpace" title="{CoordSpace}" alt="" coords="1539,1046,1613,1095"/>
+<area shape="rect" id="node18" href="#CoordSys" title="{CoordSys}" alt="" coords="551,670,623,719"/>
+<area shape="rect" id="node30" href="#domain.generic.GenericFrame" title="{domain/generic/GenericFrame}" alt="" coords="665,801,820,850"/>
+<area shape="rect" id="node19" href="#AstroCoordSystem" title="{AstroCoordSystem|+refPosition : coords:domain.spatial.RefLocation\l+planetaryEphem : ivoa:string\l}" alt="" coords="891,266,1125,329"/>
+<area shape="rect" id="node44" href="#domain.spatial.SpaceFrame" title="{domain/spatial/SpaceFrame|+spaceRefFrame : coords:domain.spatial.StdRefFrame\l+equinox : coords:domain.spatial.Epoch\l}" alt="" coords="647,663,905,726"/>
+<area shape="rect" id="node52" href="#domain.spectral.SpectralFrame" title="{domain/spectral/SpectralFrame}" alt="" coords="929,670,1087,719"/>
+<area shape="rect" id="node58" href="#domain.temporal.TimeFrame" title="{domain/temporal/TimeFrame|+timescale : coords:domain.temporal.TimeScale\l+refDirection : coords:domain.spatial.RefLocation\l+time0 : coords:domain.temporal.TimeStamp\l}" alt="" coords="1111,657,1351,733"/>
+<area shape="rect" id="node69" href="#domain.polarization.PolarizationFrame" title="{domain/polarization/PolarizationFrame}" alt="" coords="1375,670,1564,719"/>
+<area shape="rect" id="node20" href="#PixelCoordSystem" title="{PixelCoordSystem}" alt="" coords="425,670,527,719"/>
+<area shape="rect" id="node26" href="#domain.pixel.PixelFrame" title="{domain/pixel/PixelFrame}" alt="" coords="431,801,561,850"/>
+<area shape="rect" id="node23" href="#PhysicalAxis" title="{PhysicalAxis|+domainMin : ivoa:Quantity\l+domainMax : ivoa:Quantity\l+cyclic : ivoa:boolean\l}" alt="" coords="1788,1033,1932,1109"/>
+<area shape="rect" id="node24" href="#DiscreteAxis" title="{DiscreteAxis}" alt="" coords="1956,1046,2033,1095"/>
+<area shape="rect" id="node25" href="#domain.pixel.PixelIndex" title="{<<datatype>>\ndomain/pixel/PixelIndex}" alt="" coords="2431,801,2556,850"/>
+<area shape="rect" id="node27" href="#domain.pixel.PixelSpace" title="{domain/pixel/PixelSpace|+handedness : coords:Handedness\l}" alt="" coords="993,909,1159,958"/>
+<area shape="rect" id="node28" href="#domain.pixel.PixelAxis" title="{domain/pixel/PixelAxis|+numPix : ivoa:nonnegativeInteger\l}" alt="" coords="2057,1046,2228,1095"/>
+<area shape="rect" id="node29" href="#domain.generic.GenericCoordValue" title="{<<datatype>>\ndomain/generic/GenericCoordValue}" alt="" coords="1636,801,1815,850"/>
+<area shape="rect" id="node31" href="#domain.generic.GenericCoordSpace" title="{domain/generic/GenericCoordSpace}" alt="" coords="1183,909,1361,958"/>
+<area shape="rect" id="node32" href="#domain.spatial.EpochType" title="{<<enumeration>>\ldomain/spatial/EpochType|+J\l+B\l}" alt="" coords="1836,259,1972,335"/>
+<area shape="rect" id="node33" href="#domain.spatial.StdRefPosition" title="{<<enumeration>>\ldomain/spatial/StdRefPosition|+TOPOCENTER\l+BARYCENTER\l+HELIOCENTER\l+GEOCENTER\l+GALACTIC_CENTER\l+LOCAL_GROUP_CENTER\l+MOON\l+EMBARYCENTER\l+MERCURY\l+VENUS\l+MARS\l+JUPITER\l+SATURN\l+URANUS\l+NEPTUNE\l+PLUTO\l+RELOCATABLE\l+LSR\l+LSRK\l+LSRD\l+UNKNOWN\l+CUSTOM\l}" alt="" coords="2340,126,2495,469"/>
+<area shape="rect" id="node34" href="#domain.spatial.StdRefFrame" title="{<<enumeration>>\ldomain/spatial/StdRefFrame|+ICRS\l+FK4\l+FK5\l+ECLIPTIC\l+GALACTIC_I\l+GALACTIC_II\l+SUPER_GALACTIC\l+AZ_EL\l+BODY\l+GEO_C\l+GEO_D\l+MAG\l+GSE\l+GSM\l+SM\l+HGC\l+HEE\l+HEEQ\l+HCI\l+HCD\l+MERCURY_C\l+VENUS_C\l+LUNA_C\l+MARS_C\l+JUPITER_C_III\l+SATURN_C_III\l+URANUS_C_III\l+NEPTUNE_C_III\l+PLUTO_C\l+MERCURY_G\l+VENUS_G\l+LUNA_G\l+MARS_G\l+JUPITER_G_III\l+SATURN_G_III\l+URANUS_G_III\l+NEPTUNE_G_III\l+PLUTO_G\l+UNKNOWN\l+CUSTOM\l}" alt="" coords="2691,6,2835,589"/>
+<area shape="rect" id="node35" href="#domain.spatial.Epoch" title="{<<datatype>>\ndomain/spatial/Epoch|+type : coords:domain.spatial.EpochType\l+year : ivoa:real\l}" alt="" coords="2944,259,3144,335"/>
+<area shape="rect" id="node36" href="#domain.spatial.SpatialCoordValue" title="{<<datatype>>\ndomain/spatial/SpatialCoordValue}" alt="" coords="1839,801,2007,850"/>
+<area shape="rect" id="node37" href="#domain.spatial.RefLocation" title="{<<datatype>>\ndomain/spatial/RefLocation}" alt="" coords="3596,670,3737,719"/>
+<area shape="rect" id="node38" href="#domain.spatial.StdRefLocation" title="{<<datatype>>\ndomain/spatial/StdRefLocation|+position : coords:domain.spatial.StdRefPosition\l}" alt="" coords="3427,266,3656,329"/>
+<area shape="rect" id="node39" href="#domain.spatial.CustomRefLocation" title="{<<datatype>>\ndomain/spatial/CustomRefLocation|+epoch : coords:domain.spatial.Epoch\l+position : coords:domain.spatial.SpatialCoord\l+velocity : coords:domain.spatial.SpatialCoord\l}" alt="" coords="3680,253,3901,342"/>
+<area shape="rect" id="node40" href="#domain.spatial.SpatialCoord" title="{<<datatype>>\ndomain/spatial/SpatialCoord}" alt="" coords="2988,909,3129,958"/>
+<area shape="rect" id="node41" href="#domain.spatial.SpatialCoord1D" title="{<<datatype>>\ndomain/spatial/SpatialCoord1D}" alt="" coords="2892,801,3047,850"/>
+<area shape="rect" id="node42" href="#domain.spatial.SpatialCoord2D" title="{<<datatype>>\ndomain/spatial/SpatialCoord2D}" alt="" coords="3071,801,3225,850"/>
+<area shape="rect" id="node43" href="#domain.spatial.SpatialCoord3D" title="{<<datatype>>\ndomain/spatial/SpatialCoord3D}" alt="" coords="3249,801,3404,850"/>
+<area shape="rect" id="node45" href="#domain.spatial.SpatialSpace" title="{domain/spatial/SpatialSpace}" alt="" coords="1385,909,1527,958"/>
+<area shape="rect" id="node46" href="#domain.spatial.Spherical" title="{domain/spatial/Spherical|+handedness : coords:Handedness\l}" alt="" coords="1208,801,1373,850"/>
+<area shape="rect" id="node47" href="#domain.spatial.Cartesian" title="{domain/spatial/Cartesian|+handedness : coords:Handedness\l}" alt="" coords="1397,801,1563,850"/>
+<area shape="rect" id="node48" href="#domain.spectral.Wavelength" title="{<<primitive type>>\ndomain/spectral/Wavelength}" alt="" coords="1716,670,1860,719"/>
+<area shape="rect" id="node51" href="#domain.spectral.SpectralValue" title="{<<datatype>>\ndomain/spectral/SpectralValue}" alt="" coords="2031,801,2185,850"/>
+<area shape="rect" id="node49" href="#domain.spectral.Frequency" title="{<<primitive type>>\ndomain/spectral/Frequency}" alt="" coords="1884,670,2023,719"/>
+<area shape="rect" id="node50" href="#domain.spectral.Energy" title="{<<primitive type>>\ndomain/spectral/Energy}" alt="" coords="2047,670,2169,719"/>
+<area shape="rect" id="node53" href="#domain.spectral.SpectralSpace" title="{domain/spectral/SpectralSpace}" alt="" coords="1551,909,1705,958"/>
+<area shape="rect" id="node54" href="#domain.temporal.TimeScale" title="{<<enumeration>>\ldomain/temporal/TimeScale|+TT\l+ET\l+TDB\l+TCG\l+TCB\l+TAI\l+UTC\l+LST\l+LOCAL\l}" alt="" coords="3925,213,4069,382"/>
+<area shape="rect" id="node55" href="#domain.temporal.TimeStamp" title="{<<datatype>>\ndomain/temporal/TimeStamp}" alt="" coords="2209,801,2356,850"/>
+<area shape="rect" id="node56" href="#domain.temporal.TimeOffset" title="{<<datatype>>\ndomain/temporal/TimeOffset}" alt="" coords="2193,670,2340,719"/>
+<area shape="rect" id="node57" href="#domain.temporal.ISOTime" title="{<<datatype>>\ndomain/temporal/ISOTime}" alt="" coords="2364,670,2503,719"/>
+<area shape="rect" id="node59" href="#domain.temporal.TimeSpace" title="{domain/temporal/TimeSpace}" alt="" coords="1729,909,1876,958"/>
+<area shape="rect" id="node60" href="#domain.polarization.PolStokesEnum" title="{<<enumeration>>\ldomain/polarization/PolStokesEnum|+I\l+Q\l+U\l+V\l}" alt="" coords="4093,246,4269,349"/>
+<area shape="rect" id="node61" href="#domain.polarization.PolCircularEnum" title="{<<enumeration>>\ldomain/polarization/PolCircularEnum|+RR\l+LL\l+RL\l+LR\l}" alt="" coords="4293,246,4477,349"/>
+<area shape="rect" id="node62" href="#domain.polarization.PolLinearEnum" title="{<<enumeration>>\ldomain/polarization/PolLinearEnum|+XX\l+YY\l+XY\l+YX\l}" alt="" coords="4501,246,4680,349"/>
+<area shape="rect" id="node63" href="#domain.polarization.PolVectorEnum" title="{<<enumeration>>\ldomain/polarization/PolVectorEnum|+I\l+PF\l+PP\l+PA\l}" alt="" coords="4704,246,4883,349"/>
+<area shape="rect" id="node64" href="#domain.polarization.PolCoordValue" title="{<<datatype>>\ndomain/polarization/PolCoordValue}" alt="" coords="2692,801,2868,850"/>
+<area shape="rect" id="node65" href="#domain.polarization.PolStokes" title="{<<datatype>>\ndomain/polarization/PolStokes|+cval : coords:domain.polarization.PolStokesEnum\l}" alt="" coords="2527,663,2767,726"/>
+<area shape="rect" id="node66" href="#domain.polarization.PolCircular" title="{<<datatype>>\ndomain/polarization/PolCircular|+cval : coords:domain.polarization.PolCircularEnum\l}" alt="" coords="2791,663,3039,726"/>
+<area shape="rect" id="node67" href="#domain.polarization.PolLinear" title="{<<datatype>>\ndomain/polarization/PolLinear|+cval : coords:domain.polarization.PolLinearEnum\l}" alt="" coords="3063,663,3305,726"/>
+<area shape="rect" id="node68" href="#domain.polarization.PolVector" title="{<<datatype>>\ndomain/polarization/PolVector|+cval : coords:domain.polarization.PolVectorEnum\l}" alt="" coords="3329,663,3572,726"/>
+<area shape="rect" id="node70" href="#domain.polarization.PolarizationSpace" title="{domain/polarization/PolarizationSpace}" alt="" coords="1900,909,2087,958"/>
 </map>
 
     <hr>
@@ -472,114 +445,38 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">child package(s)</td>
-        <td colspan="2" class="feature-detail"><a href="#domain">domain</a> <a href="#dtypes">dtypes</a> 
+        <td colspan="2" class="feature-detail"><a href="#domain">domain</a> 
         </td>
       </tr>
       <tr>
         <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate</a> 
-        </td>
-      </tr>
-    </table>
-    <h3><a name="DerivedCoordinate"></a>2.1.1 objectType: DerivedCoordinate
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">DerivedCoordinate</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.polarization.DerivedPolarizationCoordinate">DerivedPolarizationCoordinate</a> <a href="#domain.spectral.DerivedSpectralCoordinate">DerivedSpectralCoordinate</a> <a href="#domain.generic.Measurement">Measurement</a> <a href="#domain.spatial.Position">Position</a> <a href="#domain.temporal.Time">Time</a> 
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain"></a>2.2 package: domain
-    </h3>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">domain</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#model_section">coords</a></td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">child package(s)</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.generic">generic</a> <a href="#domain.polarization">polarization</a> <a href="#domain.spatial">spatial</a> <a href="#domain.spectral">spectral</a> <a href="#domain.temporal">temporal</a> 
-        </td>
-      </tr>
-    </table>
-    <h3><a name="domain.generic"></a>2.3 package: generic
-    </h3>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">domain.generic</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
+        <td colspan="2" class="feature-detail"><a href="#AstroCoordSystem">AstroCoordSystem</a> <a href="#Axis">Axis</a> <a href="#CoordFrame">CoordFrame</a> <a href="#CoordSpace">CoordSpace</a> <a href="#CoordSys">CoordSys</a> <a href="#DiscreteAxis">DiscreteAxis</a> <a href="#PhysicalAxis">PhysicalAxis</a> <a href="#PixelCoordSystem">PixelCoordSystem</a> 
         </td>
       </tr>
       <tr>
-        <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#domain">domain</a></td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.generic.Error">Error</a> <a href="#domain.generic.Measurement">Measurement</a> <a href="#domain.generic.RandomError">RandomError</a> <a href="#domain.generic.Resolution">Resolution</a> <a href="#domain.generic.StatisticalError">StatisticalError</a> <a href="#domain.generic.SystematicError">SystematicError</a> 
+        <td width="20%" class="info-title">Data types</td>
+        <td colspan="2" class="feature-detail"><a href="#BasicCoordValue">BasicCoordValue</a> <a href="#BinnedCoordValue">BinnedCoordValue</a> <a href="#CoordValue">CoordValue</a> <a href="#DiscreteCoordValue">DiscreteCoordValue</a> <a href="#MultiCoordValue">MultiCoordValue</a> <a href="#PhysicalCoordValue">PhysicalCoordValue</a> 
         </td>
       </tr>
       <tr>
-        <td width="20%" class="info-title">Parent package</td>
-        <td colspan="2" class="feature-detail"><a href="#domain">domain</a> 
+        <td width="20%" class="info-title">Enumerations</td>
+        <td colspan="2" class="feature-detail"><a href="#Handedness">Handedness</a> 
         </td>
       </tr>
     </table>
-    <h3><a name="domain.generic.Error"></a>2.3.1 objectType: Error
+    <h3><a name="AstroCoordSystem"></a>2.1.1 objectType: AstroCoordSystem
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.generic.Error</td>
+          <td class="objecttype-name" colspan="1">AstroCoordSystem</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
+          <td class="feature-detail" colspan="1">AstroCoordSystem is a container object for organizing physical Coordinate Frame specifications into related groupings.  The
+            object provides a references to Coordinate Frame instances in each of the known domain implementations.  As a whole, the AstroCoordSystem
+            should provide a complete description of the domain space. 
           </td>
         </tr>
         <tr>
@@ -589,66 +486,45 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.generic">generic</a></td>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordSys">CoordSys [coords:CoordSys]</a></td>
                     </tr>
                     <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.generic.RandomError">RandomError</a> <a href="#domain.generic.Resolution">Resolution</a> <a href="#domain.generic.StatisticalError">StatisticalError</a> <a href="#domain.generic.SystematicError">SystematicError</a> 
-                      </td>
+                      <td colspan="3" class="info-title">attributes</td>
                     </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.generic.Measurement"></a>2.3.2 objectType: Measurement
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.generic.Measurement</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.generic">generic</a></td>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate [coords:DerivedCoordinate]</a></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="AstroCoordSystem.refPosition"></a><b>refPosition</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.spatial.RefLocation">RefLocation [coords:domain.spatial.RefLocation]</a></td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">attributes</td>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">AstroCoordSystem.refPosition</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.generic.Measurement.coord"></a><b>coord</b></td>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="AstroCoordSystem.planetaryEphem"></a><b>planetaryEphem</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#coordsys">coordsys</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html#domain.generic.GenericCoord">domain.generic.GenericCoord</a></td>
+                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#string">string</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.generic.Measurement.coord</td>
+                      <td class="feature-detail">AstroCoordSystem.planetaryEphem</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -662,7 +538,7 @@
                       </td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">compositions</td>
+                      <td colspan="3" class="info-title">references</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -670,21 +546,37 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="domain.generic.Measurement.error"></a><b>error</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="AstroCoordSystem.polarizationFrame"></a><b>polarizationFrame</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.generic.Error">Error [coords:domain.generic.Error]</a></td>
+                      <td class="feature-detail"><a href="#domain.polarization.PolarizationFrame">PolarizationFrame [coords:domain.polarization.PolarizationFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.generic.Measurement.error</td>
+                      <td class="feature-detail">AstroCoordSystem.polarizationFrame</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="AstroCoordSystem.spaceFrame"></a><b>spaceFrame</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.spatial.SpaceFrame">SpaceFrame [coords:domain.spatial.SpaceFrame]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">AstroCoordSystem.spaceFrame</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -693,62 +585,38 @@
                         
                       </td>
                     </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.generic.RandomError"></a>2.3.3 objectType: RandomError
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.generic.RandomError</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.generic">generic</a></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="AstroCoordSystem.spectralFrame"></a><b>spectralFrame</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.spectral.SpectralFrame">SpectralFrame [coords:domain.spectral.SpectralFrame]</a></td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.generic.Error">Error [coords:domain.generic.Error]</a></td>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">AstroCoordSystem.spectralFrame</td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">attributes</td>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.generic.RandomError.randError"></a><b>randError</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="AstroCoordSystem.timeFrame"></a><b>timeFrame</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#domain.temporal.TimeFrame">TimeFrame [coords:domain.temporal.TimeFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.generic.RandomError.randError</td>
+                      <td class="feature-detail">AstroCoordSystem.timeFrame</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -764,13 +632,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.generic.Resolution"></a>2.3.4 objectType: Resolution
+    </div><br><h3><a name="Axis"></a>2.1.2 objectType: Axis
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.generic.Resolution</td>
+          <td class="objecttype-name" colspan="1">Axis</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -786,12 +654,14 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.generic">generic</a></td>
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#DiscreteAxis">DiscreteAxis</a> <a href="#PhysicalAxis">PhysicalAxis</a> <a href="#domain.pixel.PixelAxis">PixelAxis</a> 
+                      </td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.generic.Error">Error [coords:domain.generic.Error]</a></td>
+                      <td class="info-title">referrers</td>
+                      <td class="feature-detail" colspan="3"><a href="#CoordValue">CoordValue</a> 
+                      </td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -802,17 +672,17 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.generic.Resolution.res"></a><b>res</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="Axis.name"></a><b>name</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#string">string</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.generic.Resolution.res</td>
+                      <td class="feature-detail">Axis.name</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -828,13 +698,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.generic.StatisticalError"></a>2.3.5 objectType: StatisticalError
+    </div><br><h3><a name="BasicCoordValue"></a>2.1.3 dataType: BasicCoordValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.generic.StatisticalError</td>
+          <td class="objecttype-name" colspan="1">BasicCoordValue</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -850,39 +720,8 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.generic">generic</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.generic.Error">Error [coords:domain.generic.Error]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.generic.StatisticalError.statError"></a><b>statError</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.generic.StatisticalError.statError</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#CoordValue">CoordValue</a> <a href="#MultiCoordValue">MultiCoordValue</a> 
                       </td>
                     </tr>
                   </table>
@@ -892,13 +731,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.generic.SystematicError"></a>2.3.6 objectType: SystematicError
+    </div><br><h3><a name="BinnedCoordValue"></a>2.1.4 dataType: BinnedCoordValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.generic.SystematicError</td>
+          <td class="objecttype-name" colspan="1">BinnedCoordValue</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -914,12 +753,13 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.generic">generic</a></td>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordValue">CoordValue [coords:CoordValue]</a></td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.generic.Error">Error [coords:domain.generic.Error]</a></td>
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#domain.pixel.PixelIndex">PixelIndex</a> 
+                      </td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -930,13 +770,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.generic.SystematicError.sysError"></a><b>sysError</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="BinnedCoordValue.cval"></a><b>cval</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#integer">integer</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.generic.SystematicError.sysError</td>
+                      <td class="feature-detail">BinnedCoordValue.cval</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -956,42 +796,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.polarization"></a>2.4 package: polarization
-    </h3>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">domain.polarization</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#domain">domain</a></td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.polarization.Circular">Circular</a> <a href="#domain.polarization.DerivedPolarizationCoordinate">DerivedPolarizationCoordinate</a> <a href="#domain.polarization.Linear">Linear</a> <a href="#domain.polarization.Stokes">Stokes</a> <a href="#domain.polarization.Vector">Vector</a> 
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Parent package</td>
-        <td colspan="2" class="feature-detail"><a href="#domain">domain</a> 
-        </td>
-      </tr>
-    </table>
-    <h3><a name="domain.polarization.Circular"></a>2.4.1 objectType: Circular
+    </div><br><h3><a name="CoordFrame"></a>2.1.5 objectType: CoordFrame
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.polarization.Circular</td>
+          <td class="objecttype-name" colspan="1">CoordFrame</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -1007,15 +818,12 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization">polarization</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.DerivedPolarizationCoordinate">DerivedPolarizationCoordinate [coords:domain.polarization.DerivedPolarizationCoordinate]</a></td>
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#domain.generic.GenericFrame">GenericFrame</a> <a href="#domain.pixel.PixelFrame">PixelFrame</a> <a href="#domain.polarization.PolarizationFrame">PolarizationFrame</a> <a href="#domain.spatial.SpaceFrame">SpaceFrame</a> <a href="#domain.spectral.SpectralFrame">SpectralFrame</a> <a href="#domain.temporal.TimeFrame">TimeFrame</a> 
+                      </td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">attributes</td>
+                      <td colspan="3" class="info-title">compositions</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -1023,19 +831,23 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.Circular.coord"></a><b>coord</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="CoordFrame.coordSpace"></a><b>coordSpace</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#coordsys">coordsys</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html#domain.polarization.PolCircularCoord">domain.polarization.PolCircularCoord</a></td>
+                      <td class="feature-detail"><a href="#CoordSpace">CoordSpace [coords:CoordSpace]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.polarization.Circular.coord</td>
+                      <td class="feature-detail">CoordFrame.coordSpace</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
                       <td class="feature-detail">1</td>
                     </tr>
                     <tr>
+                      <td class="feature-heading">isOrdered</td>
+                      <td class="feature-detail">false</td>
+                    </tr>
+                    <tr>
                       <td class="feature-heading">description</td>
                       <td class="feature-detail">
                         TODO : Missing description : please, update your UML model asap.
@@ -1049,13 +861,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.polarization.DerivedPolarizationCoordinate"></a>2.4.2 objectType: DerivedPolarizationCoordinate
+    </div><br><h3><a name="CoordSpace"></a>2.1.6 objectType: CoordSpace
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.polarization.DerivedPolarizationCoordinate</td>
+          <td class="objecttype-name" colspan="1">CoordSpace</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -1071,56 +883,12 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization">polarization</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate [coords:DerivedCoordinate]</a></td>
-                    </tr>
-                    <tr>
                       <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.polarization.Circular">Circular</a> <a href="#domain.polarization.Linear">Linear</a> <a href="#domain.polarization.Stokes">Stokes</a> <a href="#domain.polarization.Vector">Vector</a> 
+                      <td class="feature-detail" colspan="3"><a href="#domain.generic.GenericCoordSpace">GenericCoordSpace</a> <a href="#domain.pixel.PixelSpace">PixelSpace</a> <a href="#domain.polarization.PolarizationSpace">PolarizationSpace</a> <a href="#domain.spatial.SpatialSpace">SpatialSpace</a> <a href="#domain.spectral.SpectralSpace">SpectralSpace</a> <a href="#domain.temporal.TimeSpace">TimeSpace</a> 
                       </td>
                     </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.polarization.Linear"></a>2.4.3 objectType: Linear
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.polarization.Linear</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization">polarization</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.DerivedPolarizationCoordinate">DerivedPolarizationCoordinate [coords:domain.polarization.DerivedPolarizationCoordinate]</a></td>
-                    </tr>
                     <tr>
-                      <td colspan="3" class="info-title">attributes</td>
+                      <td colspan="3" class="info-title">compositions</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -1128,17 +896,21 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.Linear.coord"></a><b>coord</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="CoordSpace.coordAxis"></a><b>coordAxis</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#coordsys">coordsys</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html#domain.polarization.PolLinearCoord">domain.polarization.PolLinearCoord</a></td>
+                      <td class="feature-detail"><a href="#Axis">Axis [coords:Axis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.polarization.Linear.coord</td>
+                      <td class="feature-detail">CoordSpace.coordAxis</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td class="feature-detail">1..*</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">isOrdered</td>
+                      <td class="feature-detail">false</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -1154,18 +926,17 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.polarization.Stokes"></a>2.4.4 objectType: Stokes
+    </div><br><h3><a name="CoordSys"></a>2.1.7 objectType: CoordSys
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.polarization.Stokes</td>
+          <td class="objecttype-name" colspan="1">CoordSys</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
+          <td class="feature-detail" colspan="1">The CoordSys object is the parent of a set of containers for organizing Coordinate Frame specifications into related groupings.
             
           </td>
         </tr>
@@ -1176,15 +947,12 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization">polarization</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.DerivedPolarizationCoordinate">DerivedPolarizationCoordinate [coords:domain.polarization.DerivedPolarizationCoordinate]</a></td>
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#AstroCoordSystem">AstroCoordSystem</a> 
+                      </td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">attributes</td>
+                      <td colspan="3" class="info-title">references</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -1192,17 +960,17 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.Stokes.coord"></a><b>coord</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="CoordSys.genericFrame"></a><b>genericFrame</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#coordsys">coordsys</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html#domain.polarization.PolStokesCoord">domain.polarization.PolStokesCoord</a></td>
+                      <td class="feature-detail"><a href="#domain.generic.GenericFrame">GenericFrame [coords:domain.generic.GenericFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.polarization.Stokes.coord</td>
+                      <td class="feature-detail">CoordSys.genericFrame</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td class="feature-detail">0..*</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -1218,13 +986,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.polarization.Vector"></a>2.4.5 objectType: Vector
+    </div><br><h3><a name="CoordValue"></a>2.1.8 dataType: CoordValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.polarization.Vector</td>
+          <td class="objecttype-name" colspan="1">CoordValue</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -1240,15 +1008,16 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization">polarization</a></td>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#BasicCoordValue">BasicCoordValue [coords:BasicCoordValue]</a></td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.DerivedPolarizationCoordinate">DerivedPolarizationCoordinate [coords:domain.polarization.DerivedPolarizationCoordinate]</a></td>
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#BinnedCoordValue">BinnedCoordValue</a> <a href="#DiscreteCoordValue">DiscreteCoordValue</a> <a href="#PhysicalCoordValue">PhysicalCoordValue</a> 
+                      </td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">attributes</td>
+                      <td colspan="3" class="info-title">references</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -1256,13 +1025,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.Vector.coord"></a><b>coord</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="CoordValue.coordAxis"></a><b>coordAxis</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#coordsys">coordsys</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html#domain.polarization.PolVectorCoord">domain.polarization.PolVectorCoord</a></td>
+                      <td class="feature-detail"><a href="#Axis">Axis [coords:Axis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.polarization.Vector.coord</td>
+                      <td class="feature-detail">CoordValue.coordAxis</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1282,42 +1051,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial"></a>2.5 package: spatial
-    </h3>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">domain.spatial</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#domain">domain</a></td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.spatial.Error1D">Error1D</a> <a href="#domain.spatial.Error2D">Error2D</a> <a href="#domain.spatial.Error3D">Error3D</a> <a href="#domain.spatial.Position">Position</a> <a href="#domain.spatial.Position1D">Position1D</a> <a href="#domain.spatial.Position2D">Position2D</a> <a href="#domain.spatial.Position3D">Position3D</a> <a href="#domain.spatial.RandomError1D">RandomError1D</a> <a href="#domain.spatial.RandomError2D">RandomError2D</a> <a href="#domain.spatial.RandomError3D">RandomError3D</a> <a href="#domain.spatial.Resolution1D">Resolution1D</a> <a href="#domain.spatial.Resolution2D">Resolution2D</a> <a href="#domain.spatial.Resolution3D">Resolution3D</a> <a href="#domain.spatial.StatisticalError1D">StatisticalError1D</a> <a href="#domain.spatial.StatisticalError2D">StatisticalError2D</a> <a href="#domain.spatial.StatisticalError3D">StatisticalError3D</a> <a href="#domain.spatial.SystematicError1D">Systemati!
 cError1D<
 /a> <a href="#domain.spatial.SystematicError2D">SystematicError2D</a> <a href="#domain.spatial.SystematicError3D">SystematicError3D</a> 
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Parent package</td>
-        <td colspan="2" class="feature-detail"><a href="#domain">domain</a> 
-        </td>
-      </tr>
-    </table>
-    <h3><a name="domain.spatial.Error1D"></a>2.5.1 objectType: Error1D
+    </div><br><h3><a name="DiscreteAxis"></a>2.1.9 objectType: DiscreteAxis
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.Error1D</td>
+          <td class="objecttype-name" colspan="1">DiscreteAxis</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -1333,13 +1073,8 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.spatial.RandomError1D">RandomError1D</a> <a href="#domain.spatial.Resolution1D">Resolution1D</a> <a href="#domain.spatial.StatisticalError1D">StatisticalError1D</a> <a href="#domain.spatial.SystematicError1D">SystematicError1D</a> 
-                      </td>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#Axis">Axis [coords:Axis]</a></td>
                     </tr>
                   </table>
                 </td>
@@ -1348,13 +1083,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.Error2D"></a>2.5.2 objectType: Error2D
+    </div><br><h3><a name="DiscreteCoordValue"></a>2.1.10 dataType: DiscreteCoordValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.Error2D</td>
+          <td class="objecttype-name" colspan="1">DiscreteCoordValue</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -1370,50 +1105,19 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordValue">CoordValue [coords:CoordValue]</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.spatial.RandomError2D">RandomError2D</a> <a href="#domain.spatial.Resolution2D">Resolution2D</a> <a href="#domain.spatial.StatisticalError2D">StatisticalError2D</a> <a href="#domain.spatial.SystematicError2D">SystematicError2D</a> 
+                      <td class="feature-detail" colspan="3"><a href="#domain.polarization.PolCoordValue">PolCoordValue</a> 
                       </td>
                     </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.spatial.Error3D"></a>2.5.3 objectType: Error3D
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.Error3D</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                      <td colspan="3" class="info-title">constraints</td>
                     </tr>
                     <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.spatial.RandomError3D">RandomError3D</a> <a href="#domain.spatial.Resolution3D">Resolution3D</a> <a href="#domain.spatial.StatisticalError3D">StatisticalError3D</a> <a href="#domain.spatial.SystematicError3D">SystematicError3D</a> 
-                      </td>
+                      <td class="feature-detail" valign="top" colspan="3">coordAxis:DiscreteAxis</td>
                     </tr>
                   </table>
                 </td>
@@ -1422,54 +1126,61 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.Position"></a>2.5.4 objectType: Position
+    </div><br><h3><a name="Handedness"></a>2.1.11 enumeration: Handedness
     </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.Position</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate [coords:DerivedCoordinate]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.spatial.Position1D">Position1D</a> <a href="#domain.spatial.Position2D">Position2D</a> <a href="#domain.spatial.Position3D">Position3D</a> 
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.spatial.Position1D"></a>2.5.5 objectType: Position1D
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="2">Handedness</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="2">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3" class="info-title" align="center">literals</td>
+      </tr>
+      <tr>
+        <td class="feature-heading" width="25%">name</td>
+        <td class="feature-heading" width="25%">feature</td>
+        <td class="feature-heading" width="50%">value</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="Handedness.left"></a>left
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">Handedness.left</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="Handedness.right"></a>right
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">Handedness.right</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+    </table><br><h3><a name="MultiCoordValue"></a>2.1.12 dataType: MultiCoordValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.Position1D</td>
+          <td class="objecttype-name" colspan="1">MultiCoordValue</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -1485,43 +1196,16 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
-                    </tr>
-                    <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Position">Position [coords:domain.spatial.Position]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Position1D.coord"></a><b>coord</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#coordsys">coordsys</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html#domain.spatial.SpatialCoord">domain.spatial.SpatialCoord</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.Position1D.coord</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td colspan="3" class="feature-detail"><a href="#BasicCoordValue">BasicCoordValue [coords:BasicCoordValue]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#domain.spatial.SpatialCoord">SpatialCoord</a> 
                       </td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">compositions</td>
+                      <td colspan="3" class="info-title">attributes</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -1529,21 +1213,17 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="domain.spatial.Position1D.error"></a><b>error</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="MultiCoordValue.cmpt"></a><b>cmpt</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.Error1D">Error1D [coords:domain.spatial.Error1D]</a></td>
+                      <td class="feature-detail"><a href="#CoordValue">CoordValue [coords:CoordValue]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.Position1D.error</td>
+                      <td class="feature-detail">MultiCoordValue.cmpt</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
+                      <td class="feature-detail">1..*</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -1559,13 +1239,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.Position2D"></a>2.5.6 objectType: Position2D
+    </div><br><h3><a name="PhysicalAxis"></a>2.1.13 objectType: PhysicalAxis
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.Position2D</td>
+          <td class="objecttype-name" colspan="1">PhysicalAxis</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -1581,12 +1261,8 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
-                    </tr>
-                    <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Position">Position [coords:domain.spatial.Position]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#Axis">Axis [coords:Axis]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -1597,17 +1273,17 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Position2D.coord"></a><b>coord</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="PhysicalAxis.domainMin"></a><b>domainMin</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#coordsys">coordsys</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html#domain.spatial.SpatialCoord">domain.spatial.SpatialCoord</a></td>
+                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#Quantity">Quantity</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.Position2D.coord</td>
+                      <td class="feature-detail">PhysicalAxis.domainMin</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">2</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -1617,29 +1293,37 @@
                       </td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">compositions</td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="PhysicalAxis.domainMax"></a><b>domainMax</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#Quantity">Quantity</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">PhysicalAxis.domainMax</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">0..1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="domain.spatial.Position2D.error"></a><b>error</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="PhysicalAxis.cyclic"></a><b>cyclic</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.Error2D">Error2D [coords:domain.spatial.Error2D]</a></td>
+                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#boolean">boolean</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.Position2D.error</td>
+                      <td class="feature-detail">PhysicalAxis.cyclic</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -1655,13 +1339,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.Position3D"></a>2.5.7 objectType: Position3D
+    </div><br><h3><a name="PhysicalCoordValue"></a>2.1.14 dataType: PhysicalCoordValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.Position3D</td>
+          <td class="objecttype-name" colspan="1">PhysicalCoordValue</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -1677,12 +1361,13 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordValue">CoordValue [coords:CoordValue]</a></td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Position">Position [coords:domain.spatial.Position]</a></td>
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#domain.generic.GenericCoordValue">GenericCoordValue</a> <a href="#domain.spatial.SpatialCoordValue">SpatialCoordValue</a> <a href="#domain.spectral.SpectralValue">SpectralValue</a> <a href="#domain.temporal.TimeStamp">TimeStamp</a> 
+                      </td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -1693,17 +1378,17 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Position3D.coord"></a><b>coord</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="PhysicalCoordValue.cval"></a><b>cval</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#coordsys">coordsys</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html#domain.spatial.SpatialCoord">domain.spatial.SpatialCoord</a></td>
+                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#Quantity">Quantity</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.Position3D.coord</td>
+                      <td class="feature-detail">PhysicalCoordValue.cval</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">3</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -1713,36 +1398,10 @@
                       </td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">compositions</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="domain.spatial.Position3D.error"></a><b>error</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spatial.Error3D">Error3D [coords:domain.spatial.Error3D]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.Position3D.error</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
+                      <td colspan="3" class="info-title">constraints</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td class="feature-detail" valign="top" colspan="3">coordAxis:PhysicalAxis[1]</td>
                     </tr>
                   </table>
                 </td>
@@ -1751,19 +1410,19 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.RandomError1D"></a>2.5.8 objectType: RandomError1D
+    </div><br><h3><a name="PixelCoordSystem"></a>2.1.15 objectType: PixelCoordSystem
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.RandomError1D</td>
+          <td class="objecttype-name" colspan="1">PixelCoordSystem</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
+          <td class="feature-detail" colspan="1">The PixelCoordSystem contains the complete list of Pixel Frame specifications.  Here, the relation between the system and
+            its frames is different than in the physical CoordSys.  In the pixel domain, there is only 1 system, composed of a specific
+            set of PixelAxes organized in PixelFrames.
           </td>
         </tr>
         <tr>
@@ -1773,15 +1432,7 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error1D">Error1D [coords:domain.spatial.Error1D]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
+                      <td colspan="3" class="info-title">compositions</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -1789,17 +1440,21 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.RandomError1D.randError"></a><b>randError</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="PixelCoordSystem.pixelFrame"></a><b>pixelFrame</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#domain.pixel.PixelFrame">PixelFrame [coords:domain.pixel.PixelFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.RandomError1D.randError</td>
+                      <td class="feature-detail">PixelCoordSystem.pixelFrame</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td class="feature-detail">1..*</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">isOrdered</td>
+                      <td class="feature-detail">false</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -1815,13 +1470,72 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.RandomError2D"></a>2.5.9 objectType: RandomError2D
+    </div><br><h3><a name="domain"></a>2.2 package: domain
+    </h3>
+    <table border="1" cellspacing="2" width="100%">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">domain</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">The Domain package contains implementations of the Coordinate Frame pattern for various physical domains.  Many of these domains
+          are 1-Dimensional and there is a good deal of consolidation which could take place in those domains (ie 1-1 relations could
+          get absorbed or eliminated).  However, the defined pattern satisfies ALL domains, and we feel the consistancy this generates
+          simplifies the understanding and implementation of the model.  If one understands the pattern, the interpretation of any domain
+          is straight-forward.
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">parent</td>
+        <td colspan="2" class="feature-detail"><a href="#model_section">coords</a></td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">child package(s)</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.generic">generic</a> <a href="#domain.pixel">pixel</a> <a href="#domain.polarization">polarization</a> <a href="#domain.spatial">spatial</a> <a href="#domain.spectral">spectral</a> <a href="#domain.temporal">temporal</a> 
+        </td>
+      </tr>
+    </table>
+    <h3><a name="domain.generic"></a>2.3 package: generic
+    </h3>
+    <table border="1" cellspacing="2" width="100%">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">domain.generic</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">Implementation of the Coordinate Frame pattern for 'generic' domains.   The generic domain covers any domain not represented
+          by the specialized physical domains, and a specialized representation is not deemed necessary.
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">parent</td>
+        <td colspan="2" class="feature-detail"><a href="#domain">domain</a></td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Object types</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.generic.GenericCoordSpace">GenericCoordSpace</a> <a href="#domain.generic.GenericFrame">GenericFrame</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Data types</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.generic.GenericCoordValue">GenericCoordValue</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Parent package</td>
+        <td colspan="2" class="feature-detail"><a href="#domain">domain</a> 
+        </td>
+      </tr>
+    </table>
+    <h3><a name="domain.generic.GenericCoordSpace"></a>2.3.1 objectType: GenericCoordSpace
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.RandomError2D</td>
+          <td class="objecttype-name" colspan="1">domain.generic.GenericCoordSpace</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -1838,39 +1552,17 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.generic">generic</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error2D">Error2D [coords:domain.spatial.Error2D]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.RandomError2D.randError"></a><b>randError</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordSpace">CoordSpace [coords:CoordSpace]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.RandomError2D.randError</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td colspan="3" class="info-title">constraints</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td class="feature-detail" valign="top" colspan="3">axis:PhysicalAxis[1]</td>
                     </tr>
                   </table>
                 </td>
@@ -1879,19 +1571,19 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.RandomError3D"></a>2.5.10 objectType: RandomError3D
+    </div><br><h3><a name="domain.generic.GenericCoordValue"></a>2.3.2 dataType: GenericCoordValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.RandomError3D</td>
+          <td class="objecttype-name" colspan="1">domain.generic.GenericCoordValue</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
+          <td class="feature-detail" colspan="1">An instance of a point along the associated axis.
+            NOTE: This represents an absolute point in the coordinate space and not a 'measured' value, which is defined in the coords
+            model.
           </td>
         </tr>
         <tr>
@@ -1902,39 +1594,11 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.generic">generic</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error3D">Error3D [coords:domain.spatial.Error3D]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.RandomError3D.randError"></a><b>randError</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.RandomError3D.randError</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td colspan="3" class="feature-detail"><a href="#PhysicalCoordValue">PhysicalCoordValue [coords:PhysicalCoordValue]</a></td>
                     </tr>
                   </table>
                 </td>
@@ -1943,18 +1607,19 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.Resolution1D"></a>2.5.11 objectType: Resolution1D
+    </div><br><h3><a name="domain.generic.GenericFrame"></a>2.3.3 objectType: GenericFrame
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.Resolution1D</td>
+          <td class="objecttype-name" colspan="1">domain.generic.GenericFrame</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
+          <td class="feature-detail" colspan="1">origin: 0.0 
+            dimensionality: 1D
+            orientation: n/a
             
           </td>
         </tr>
@@ -1966,39 +1631,22 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.generic">generic</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error1D">Error1D [coords:domain.spatial.Error1D]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coords:CoordFrame]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Resolution1D.res"></a><b>res</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.Resolution1D.res</td>
+                      <td class="info-title">referrers</td>
+                      <td class="feature-detail" colspan="3"><a href="#CoordSys">CoordSys</a> 
+                      </td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td colspan="3" class="info-title">constraints</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td class="feature-detail" valign="top" colspan="3">coordSpace:GenericCoordSpace[1]</td>
                     </tr>
                   </table>
                 </td>
@@ -2007,13 +1655,47 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.Resolution2D"></a>2.5.12 objectType: Resolution2D
+    </div><br><h3><a name="domain.pixel"></a>2.4 package: pixel
+    </h3>
+    <table border="1" cellspacing="2" width="100%">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">domain.pixel</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">This package implements the Coordinate Frame pattern for the Pixel domain.
+          The Pixel coordinate space is defined as a 'virtual' binned space, with no physical meaning.  The axes in this space provide
+          integer indexes into the space.
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">parent</td>
+        <td colspan="2" class="feature-detail"><a href="#domain">domain</a></td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Object types</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.pixel.PixelAxis">PixelAxis</a> <a href="#domain.pixel.PixelFrame">PixelFrame</a> <a href="#domain.pixel.PixelSpace">PixelSpace</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Data types</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.pixel.PixelIndex">PixelIndex</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Parent package</td>
+        <td colspan="2" class="feature-detail"><a href="#domain">domain</a> 
+        </td>
+      </tr>
+    </table>
+    <h3><a name="domain.pixel.PixelAxis"></a>2.4.1 objectType: PixelAxis
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.Resolution2D</td>
+          <td class="objecttype-name" colspan="1">domain.pixel.PixelAxis</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -2030,11 +1712,11 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.pixel">pixel</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error2D">Error2D [coords:domain.spatial.Error2D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#Axis">Axis [coords:Axis]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2045,13 +1727,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Resolution2D.res"></a><b>res</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.pixel.PixelAxis.numPix"></a><b>numPix</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
+                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#nonnegativeInteger">nonnegativeInteger</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.Resolution2D.res</td>
+                      <td class="feature-detail">domain.pixel.PixelAxis.numPix</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -2071,18 +1753,19 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.Resolution3D"></a>2.5.13 objectType: Resolution3D
+    </div><br><h3><a name="domain.pixel.PixelFrame"></a>2.4.2 objectType: PixelFrame
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.Resolution3D</td>
+          <td class="objecttype-name" colspan="1">domain.pixel.PixelFrame</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
+          <td class="feature-detail" colspan="1">origin: 0.0
+            dimensionality: 1..3
+            orientation: n/a
             
           </td>
         </tr>
@@ -2094,39 +1777,17 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.pixel">pixel</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error3D">Error3D [coords:domain.spatial.Error3D]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Resolution3D.res"></a><b>res</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.Resolution3D.res</td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coords:CoordFrame]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td colspan="3" class="info-title">constraints</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td class="feature-detail" valign="top" colspan="3">coordSpace:PixelSpace[1]</td>
                     </tr>
                   </table>
                 </td>
@@ -2135,13 +1796,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.StatisticalError1D"></a>2.5.14 objectType: StatisticalError1D
+    </div><br><h3><a name="domain.pixel.PixelIndex"></a>2.4.3 dataType: PixelIndex
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.StatisticalError1D</td>
+          <td class="objecttype-name" colspan="1">domain.pixel.PixelIndex</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -2158,39 +1819,17 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.pixel">pixel</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error1D">Error1D [coords:domain.spatial.Error1D]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.StatisticalError1D.statError"></a><b>statError</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#BinnedCoordValue">BinnedCoordValue [coords:BinnedCoordValue]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.StatisticalError1D.statError</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td colspan="3" class="info-title">constraints</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td class="feature-detail" valign="top" colspan="3">coordAxis:PixelAxis</td>
                     </tr>
                   </table>
                 </td>
@@ -2199,13 +1838,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.StatisticalError2D"></a>2.5.15 objectType: StatisticalError2D
+    </div><br><h3><a name="domain.pixel.PixelSpace"></a>2.4.4 objectType: PixelSpace
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.StatisticalError2D</td>
+          <td class="objecttype-name" colspan="1">domain.pixel.PixelSpace</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -2222,11 +1861,11 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.pixel">pixel</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error2D">Error2D [coords:domain.spatial.Error2D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordSpace">CoordSpace [coords:CoordSpace]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2237,17 +1876,17 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.StatisticalError2D.statError"></a><b>statError</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.pixel.PixelSpace.handedness"></a><b>handedness</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
+                      <td class="feature-detail"><a href="#Handedness">Handedness [coords:Handedness]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.StatisticalError2D.statError</td>
+                      <td class="feature-detail">domain.pixel.PixelSpace.handedness</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -2256,6 +1895,12 @@
                         
                       </td>
                     </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">constraints</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" colspan="3">coordAxis:PixelAxis[1..3]</td>
+                    </tr>
                   </table>
                 </td>
               </tr>
@@ -2263,13 +1908,52 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.StatisticalError3D"></a>2.5.16 objectType: StatisticalError3D
+    </div><br><h3><a name="domain.polarization"></a>2.5 package: polarization
+    </h3>
+    <table border="1" cellspacing="2" width="100%">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">domain.polarization</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">Implementation of the Coordinate Frame pattern for the Polarization domain.
+          This is a 1-Dimensional coordinate space, but the nature of the polarization coordinate values (discrete enumerated strings)
+          requires a different axis specification.
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">parent</td>
+        <td colspan="2" class="feature-detail"><a href="#domain">domain</a></td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Object types</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.polarization.PolarizationFrame">PolarizationFrame</a> <a href="#domain.polarization.PolarizationSpace">PolarizationSpace</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Data types</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.polarization.PolCircular">PolCircular</a> <a href="#domain.polarization.PolCoordValue">PolCoordValue</a> <a href="#domain.polarization.PolLinear">PolLinear</a> <a href="#domain.polarization.PolStokes">PolStokes</a> <a href="#domain.polarization.PolVector">PolVector</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Enumerations</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.polarization.PolCircularEnum">PolCircularEnum</a> <a href="#domain.polarization.PolLinearEnum">PolLinearEnum</a> <a href="#domain.polarization.PolStokesEnum">PolStokesEnum</a> <a href="#domain.polarization.PolVectorEnum">PolVectorEnum</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Parent package</td>
+        <td colspan="2" class="feature-detail"><a href="#domain">domain</a> 
+        </td>
+      </tr>
+    </table>
+    <h3><a name="domain.polarization.PolCircular"></a>2.5.1 dataType: PolCircular
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.StatisticalError3D</td>
+          <td class="objecttype-name" colspan="1">domain.polarization.PolCircular</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -2286,11 +1970,11 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization">polarization</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error3D">Error3D [coords:domain.spatial.Error3D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.PolCoordValue">PolCoordValue [coords:domain.polarization.PolCoordValue]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2301,13 +1985,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.StatisticalError3D.statError"></a><b>statError</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.PolCircular.cval"></a><b>cval</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
+                      <td class="feature-detail"><a href="#domain.polarization.PolCircularEnum">PolCircularEnum [coords:domain.polarization.PolCircularEnum]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.StatisticalError3D.statError</td>
+                      <td class="feature-detail">domain.polarization.PolCircular.cval</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -2327,13 +2011,91 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.SystematicError1D"></a>2.5.17 objectType: SystematicError1D
+    </div><br><h3><a name="domain.polarization.PolCircularEnum"></a>2.5.2 enumeration: PolCircularEnum
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="2">domain.polarization.PolCircularEnum</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="2">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#domain.polarization">polarization</a></td>
+      </tr>
+      <tr>
+        <td colspan="3" class="info-title" align="center">literals</td>
+      </tr>
+      <tr>
+        <td class="feature-heading" width="25%">name</td>
+        <td class="feature-heading" width="25%">feature</td>
+        <td class="feature-heading" width="50%">value</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.polarization.PolCircularEnum.RR"></a>RR
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.polarization.PolCircularEnum.RR</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.polarization.PolCircularEnum.LL"></a>LL
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.polarization.PolCircularEnum.LL</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.polarization.PolCircularEnum.RL"></a>RL
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.polarization.PolCircularEnum.RL</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.polarization.PolCircularEnum.LR"></a>LR
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.polarization.PolCircularEnum.LR</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+    </table><br><h3><a name="domain.polarization.PolCoordValue"></a>2.5.3 dataType: PolCoordValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.SystematicError1D</td>
+          <td class="objecttype-name" colspan="1">domain.polarization.PolCoordValue</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -2350,38 +2112,15 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization">polarization</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error1D">Error1D [coords:domain.spatial.Error1D]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SystematicError1D.sysError"></a><b>sysError</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.SystematicError1D.sysError</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td colspan="3" class="feature-detail"><a href="#DiscreteCoordValue">DiscreteCoordValue [coords:DiscreteCoordValue]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#domain.polarization.PolCircular">PolCircular</a> <a href="#domain.polarization.PolLinear">PolLinear</a> <a href="#domain.polarization.PolStokes">PolStokes</a> <a href="#domain.polarization.PolVector">PolVector</a> 
                       </td>
                     </tr>
                   </table>
@@ -2391,13 +2130,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.SystematicError2D"></a>2.5.18 objectType: SystematicError2D
+    </div><br><h3><a name="domain.polarization.PolLinear"></a>2.5.4 dataType: PolLinear
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.SystematicError2D</td>
+          <td class="objecttype-name" colspan="1">domain.polarization.PolLinear</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -2414,11 +2153,11 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization">polarization</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error2D">Error2D [coords:domain.spatial.Error2D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.PolCoordValue">PolCoordValue [coords:domain.polarization.PolCoordValue]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2429,13 +2168,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SystematicError2D.sysError"></a><b>sysError</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.PolLinear.cval"></a><b>cval</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
+                      <td class="feature-detail"><a href="#domain.polarization.PolLinearEnum">PolLinearEnum [coords:domain.polarization.PolLinearEnum]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.SystematicError2D.sysError</td>
+                      <td class="feature-detail">domain.polarization.PolLinear.cval</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -2455,21 +2194,99 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.SystematicError3D"></a>2.5.19 objectType: SystematicError3D
+    </div><br><h3><a name="domain.polarization.PolLinearEnum"></a>2.5.5 enumeration: PolLinearEnum
     </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.SystematicError3D</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="2">domain.polarization.PolLinearEnum</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="2">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#domain.polarization">polarization</a></td>
+      </tr>
+      <tr>
+        <td colspan="3" class="info-title" align="center">literals</td>
+      </tr>
+      <tr>
+        <td class="feature-heading" width="25%">name</td>
+        <td class="feature-heading" width="25%">feature</td>
+        <td class="feature-heading" width="50%">value</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.polarization.PolLinearEnum.XX"></a>XX
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.polarization.PolLinearEnum.XX</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.polarization.PolLinearEnum.YY"></a>YY
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.polarization.PolLinearEnum.YY</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.polarization.PolLinearEnum.XY"></a>XY
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.polarization.PolLinearEnum.XY</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.polarization.PolLinearEnum.YX"></a>YX
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.polarization.PolLinearEnum.YX</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+    </table><br><h3><a name="domain.polarization.PolStokes"></a>2.5.6 dataType: PolStokes
+    </h3>
+    <div align="center">
+      <table border="1" width="100%" cellspacing="2">
+        <tr>
+          <td class="objecttype-title" width="20%">vodml-id</td>
+          <td class="objecttype-name" colspan="1">domain.polarization.PolStokes</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
+        </tr>
         <tr>
           <td colspan="2">
             <table width="100%" cellpadding="0" cellspacing="0" border="0">
@@ -2478,11 +2295,11 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization">polarization</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.Error3D">Error3D [coords:domain.spatial.Error3D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.PolCoordValue">PolCoordValue [coords:domain.polarization.PolCoordValue]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2493,13 +2310,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SystematicError3D.sysError"></a><b>sysError</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.PolStokes.cval"></a><b>cval</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
+                      <td class="feature-detail"><a href="#domain.polarization.PolStokesEnum">PolStokesEnum [coords:domain.polarization.PolStokesEnum]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.SystematicError3D.sysError</td>
+                      <td class="feature-detail">domain.polarization.PolStokes.cval</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -2519,42 +2336,91 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spectral"></a>2.6 package: spectral
+    </div><br><h3><a name="domain.polarization.PolStokesEnum"></a>2.5.7 enumeration: PolStokesEnum
     </h3>
-    <table border="1" cellspacing="2" width="100%">
+    <table border="1" width="100%" cellspacing="2">
       <tr>
         <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">domain.spectral</td>
+        <td class="objecttype-name" colspan="2">domain.polarization.PolStokesEnum</td>
       </tr>
       <tr>
         <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
+        <td class="feature-detail" colspan="2">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#domain">domain</a></td>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#domain.polarization">polarization</a></td>
       </tr>
       <tr>
-        <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.spectral.DerivedSpectralCoordinate">DerivedSpectralCoordinate</a> <a href="#domain.spectral.Energy">Energy</a> <a href="#domain.spectral.Error">Error</a> <a href="#domain.spectral.Frequency">Frequency</a> <a href="#domain.spectral.RandomError">RandomError</a> <a href="#domain.spectral.Resolution">Resolution</a> <a href="#domain.spectral.StatisticalError">StatisticalError</a> <a href="#domain.spectral.SystematicError">SystematicError</a> <a href="#domain.spectral.Wavelength">Wavelength</a> 
+        <td colspan="3" class="info-title" align="center">literals</td>
+      </tr>
+      <tr>
+        <td class="feature-heading" width="25%">name</td>
+        <td class="feature-heading" width="25%">feature</td>
+        <td class="feature-heading" width="50%">value</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.polarization.PolStokesEnum.I"></a>I
         </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.polarization.PolStokesEnum.I</td>
       </tr>
       <tr>
-        <td width="20%" class="info-title">Parent package</td>
-        <td colspan="2" class="feature-detail"><a href="#domain">domain</a> 
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
         </td>
       </tr>
-    </table>
-    <h3><a name="domain.spectral.DerivedSpectralCoordinate"></a>2.6.1 objectType: DerivedSpectralCoordinate
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.polarization.PolStokesEnum.Q"></a>Q
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.polarization.PolStokesEnum.Q</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.polarization.PolStokesEnum.U"></a>U
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.polarization.PolStokesEnum.U</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.polarization.PolStokesEnum.V"></a>V
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.polarization.PolStokesEnum.V</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+    </table><br><h3><a name="domain.polarization.PolVector"></a>2.5.8 dataType: PolVector
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spectral.DerivedSpectralCoordinate</td>
+          <td class="objecttype-name" colspan="1">domain.polarization.PolVector</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -2571,16 +2437,11 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization">polarization</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate [coords:DerivedCoordinate]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.spectral.Energy">Energy</a> <a href="#domain.spectral.Frequency">Frequency</a> <a href="#domain.spectral.Wavelength">Wavelength</a> 
-                      </td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization.PolCoordValue">PolCoordValue [coords:domain.polarization.PolCoordValue]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2591,13 +2452,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spectral.DerivedSpectralCoordinate.coord"></a><b>coord</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.PolVector.cval"></a><b>cval</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#coordsys">coordsys</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html#domain.spectral.SpectralCoord">domain.spectral.SpectralCoord</a></td>
+                      <td class="feature-detail"><a href="#domain.polarization.PolVectorEnum">PolVectorEnum [coords:domain.polarization.PolVectorEnum]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spectral.DerivedSpectralCoordinate.coord</td>
+                      <td class="feature-detail">domain.polarization.PolVector.cval</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -2610,38 +2471,6 @@
                         
                       </td>
                     </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">compositions</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="domain.spectral.DerivedSpectralCoordinate.error"></a><b>error</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.spectral.Error">Error [coords:domain.spectral.Error]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spectral.DerivedSpectralCoordinate.error</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
                   </table>
                 </td>
               </tr>
@@ -2649,13 +2478,91 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spectral.Energy"></a>2.6.2 objectType: Energy
+    </div><br><h3><a name="domain.polarization.PolVectorEnum"></a>2.5.9 enumeration: PolVectorEnum
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="2">domain.polarization.PolVectorEnum</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="2">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#domain.polarization">polarization</a></td>
+      </tr>
+      <tr>
+        <td colspan="3" class="info-title" align="center">literals</td>
+      </tr>
+      <tr>
+        <td class="feature-heading" width="25%">name</td>
+        <td class="feature-heading" width="25%">feature</td>
+        <td class="feature-heading" width="50%">value</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.polarization.PolVectorEnum.I"></a>I
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.polarization.PolVectorEnum.I</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.polarization.PolVectorEnum.PF"></a>PF
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.polarization.PolVectorEnum.PF</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.polarization.PolVectorEnum.PP"></a>PP
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.polarization.PolVectorEnum.PP</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.polarization.PolVectorEnum.PA"></a>PA
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.polarization.PolVectorEnum.PA</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+    </table><br><h3><a name="domain.polarization.PolarizationFrame"></a>2.5.10 objectType: PolarizationFrame
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spectral.Energy</td>
+          <td class="objecttype-name" colspan="1">domain.polarization.PolarizationFrame</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -2672,11 +2579,22 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization">polarization</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.DerivedSpectralCoordinate">DerivedSpectralCoordinate [coords:domain.spectral.DerivedSpectralCoordinate]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coords:CoordFrame]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="info-title">referrers</td>
+                      <td class="feature-detail" colspan="3"><a href="#AstroCoordSystem">AstroCoordSystem</a> 
+                      </td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">constraints</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" colspan="3">coordSpace:PolarizationSpace[1]</td>
                     </tr>
                   </table>
                 </td>
@@ -2685,13 +2603,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spectral.Error"></a>2.6.3 objectType: Error
+    </div><br><h3><a name="domain.polarization.PolarizationSpace"></a>2.5.11 objectType: PolarizationSpace
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spectral.Error</td>
+          <td class="objecttype-name" colspan="1">domain.polarization.PolarizationSpace</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -2708,12 +2626,17 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.polarization">polarization</a></td>
                     </tr>
                     <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.spectral.RandomError">RandomError</a> <a href="#domain.spectral.Resolution">Resolution</a> <a href="#domain.spectral.StatisticalError">StatisticalError</a> <a href="#domain.spectral.SystematicError">SystematicError</a> 
-                      </td>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordSpace">CoordSpace [coords:CoordSpace]</a></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">constraints</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" colspan="3">coordAxis:DiscreteAxis[1]</td>
                     </tr>
                   </table>
                 </td>
@@ -2722,49 +2645,53 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spectral.Frequency"></a>2.6.4 objectType: Frequency
+    </div><br><h3><a name="domain.spatial"></a>2.6 package: spatial
     </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spectral.Frequency</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.DerivedSpectralCoordinate">DerivedSpectralCoordinate [coords:domain.spectral.DerivedSpectralCoordinate]</a></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.spectral.RandomError"></a>2.6.5 objectType: RandomError
+    <table border="1" cellspacing="2" width="100%">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">domain.spatial</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">Implementation of the Coordinate Frame pattern for the Spatial domain.
+          This domain is relatively complex each property of the pattern ( origin, orientation, coordinate space ) has a non-trivial
+          definition and the domain has a higher level of dimensionality.
+          
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">parent</td>
+        <td colspan="2" class="feature-detail"><a href="#domain">domain</a></td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Object types</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.spatial.Cartesian">Cartesian</a> <a href="#domain.spatial.SpaceFrame">SpaceFrame</a> <a href="#domain.spatial.SpatialSpace">SpatialSpace</a> <a href="#domain.spatial.Spherical">Spherical</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Data types</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.spatial.CustomRefLocation">CustomRefLocation</a> <a href="#domain.spatial.Epoch">Epoch</a> <a href="#domain.spatial.RefLocation">RefLocation</a> <a href="#domain.spatial.SpatialCoord">SpatialCoord</a> <a href="#domain.spatial.SpatialCoord1D">SpatialCoord1D</a> <a href="#domain.spatial.SpatialCoord2D">SpatialCoord2D</a> <a href="#domain.spatial.SpatialCoord3D">SpatialCoord3D</a> <a href="#domain.spatial.SpatialCoordValue">SpatialCoordValue</a> <a href="#domain.spatial.StdRefLocation">StdRefLocation</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Enumerations</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.spatial.EpochType">EpochType</a> <a href="#domain.spatial.StdRefFrame">StdRefFrame</a> <a href="#domain.spatial.StdRefPosition">StdRefPosition</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Parent package</td>
+        <td colspan="2" class="feature-detail"><a href="#domain">domain</a> 
+        </td>
+      </tr>
+    </table>
+    <h3><a name="domain.spatial.Cartesian"></a>2.6.1 objectType: Cartesian
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spectral.RandomError</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.Cartesian</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -2781,11 +2708,11 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.Error">Error [coords:domain.spectral.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.SpatialSpace">SpatialSpace [coords:domain.spatial.SpatialSpace]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2796,17 +2723,17 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spectral.RandomError.randError"></a><b>randError</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Cartesian.handedness"></a><b>handedness</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#Handedness">Handedness [coords:Handedness]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spectral.RandomError.randError</td>
+                      <td class="feature-detail">domain.spatial.Cartesian.handedness</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -2815,6 +2742,12 @@
                         
                       </td>
                     </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">constraints</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" colspan="3">coordAxis:PhysicalAxis[1..3]</td>
+                    </tr>
                   </table>
                 </td>
               </tr>
@@ -2822,13 +2755,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spectral.Resolution"></a>2.6.6 objectType: Resolution
+    </div><br><h3><a name="domain.spatial.CustomRefLocation"></a>2.6.2 dataType: CustomRefLocation
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spectral.Resolution</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.CustomRefLocation</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -2845,11 +2778,11 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.Error">Error [coords:domain.spectral.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.RefLocation">RefLocation [coords:domain.spatial.RefLocation]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2860,17 +2793,17 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spectral.Resolution.res"></a><b>res</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.CustomRefLocation.epoch"></a><b>epoch</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.Epoch">Epoch [coords:domain.spatial.Epoch]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spectral.Resolution.res</td>
+                      <td class="feature-detail">domain.spatial.CustomRefLocation.epoch</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -2879,62 +2812,38 @@
                         
                       </td>
                     </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.spectral.StatisticalError"></a>2.6.7 objectType: StatisticalError
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spectral.StatisticalError</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.CustomRefLocation.position"></a><b>position</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.spatial.SpatialCoord">SpatialCoord [coords:domain.spatial.SpatialCoord]</a></td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.Error">Error [coords:domain.spectral.Error]</a></td>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.spatial.CustomRefLocation.position</td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">attributes</td>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spectral.StatisticalError.statError"></a><b>statError</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.CustomRefLocation.velocity"></a><b>velocity</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.SpatialCoord">SpatialCoord [coords:domain.spatial.SpatialCoord]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spectral.StatisticalError.statError</td>
+                      <td class="feature-detail">domain.spatial.CustomRefLocation.velocity</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -2950,13 +2859,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spectral.SystematicError"></a>2.6.8 objectType: SystematicError
+    </div><br><h3><a name="domain.spatial.Epoch"></a>2.6.3 dataType: Epoch
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spectral.SystematicError</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.Epoch</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -2973,11 +2882,7 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.Error">Error [coords:domain.spectral.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -2988,13 +2893,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spectral.SystematicError.sysError"></a><b>sysError</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Epoch.type"></a><b>type</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.EpochType">EpochType [coords:domain.spatial.EpochType]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spectral.SystematicError.sysError</td>
+                      <td class="feature-detail">domain.spatial.Epoch.type</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -3007,41 +2912,25 @@
                         
                       </td>
                     </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="domain.spectral.Wavelength"></a>2.6.9 objectType: Wavelength
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spectral.Wavelength</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Epoch.year"></a><b>year</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#real">real</a></td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.spectral.DerivedSpectralCoordinate">DerivedSpectralCoordinate [coords:domain.spectral.DerivedSpectralCoordinate]</a></td>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.spatial.Epoch.year</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                   </table>
                 </td>
@@ -3050,47 +2939,73 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.temporal"></a>2.7 package: temporal
+    </div><br><h3><a name="domain.spatial.EpochType"></a>2.6.4 enumeration: EpochType
     </h3>
-    <table border="1" cellspacing="2" width="100%">
+    <table border="1" width="100%" cellspacing="2">
       <tr>
         <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">domain.temporal</td>
+        <td class="objecttype-name" colspan="2">domain.spatial.EpochType</td>
       </tr>
       <tr>
         <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
+        <td class="feature-detail" colspan="2">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#domain">domain</a></td>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
       </tr>
       <tr>
-        <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.temporal.Error">Error</a> <a href="#domain.temporal.RandomError">RandomError</a> <a href="#domain.temporal.Resolution">Resolution</a> <a href="#domain.temporal.StatisticalError">StatisticalError</a> <a href="#domain.temporal.SystematicError">SystematicError</a> <a href="#domain.temporal.Time">Time</a> 
+        <td colspan="3" class="info-title" align="center">literals</td>
+      </tr>
+      <tr>
+        <td class="feature-heading" width="25%">name</td>
+        <td class="feature-heading" width="25%">feature</td>
+        <td class="feature-heading" width="50%">value</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.EpochType.J"></a>J
         </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.EpochType.J</td>
       </tr>
       <tr>
-        <td width="20%" class="info-title">Parent package</td>
-        <td colspan="2" class="feature-detail"><a href="#domain">domain</a> 
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
         </td>
       </tr>
-    </table>
-    <h3><a name="domain.temporal.Error"></a>2.7.1 objectType: Error
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.EpochType.B"></a>B
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.EpochType.B</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+    </table><br><h3><a name="domain.spatial.RefLocation"></a>2.6.5 dataType: RefLocation
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.temporal.Error</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.RefLocation</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
+          <td class="feature-detail" colspan="1">RefLocation defines the origin of the spatial coordinate space.  This location is represented either by a standard reference
+            position, or a specified point in another Spatial frame.  This object is used as the origin of the SpaceFrame here, but also
+            to specify the Spatial Reference Position (refPosition) associated with other domain Frames.  For example, in the Time domain,
+            the Spatial Reference Position indicates that the 'time' values are the time that the 'event' occured at that location, which
+            may be different from the detector location.  
             
           </td>
         </tr>
@@ -3102,11 +3017,11 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal">temporal</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.temporal.RandomError">RandomError</a> <a href="#domain.temporal.Resolution">Resolution</a> <a href="#domain.temporal.StatisticalError">StatisticalError</a> <a href="#domain.temporal.SystematicError">SystematicError</a> 
+                      <td class="feature-detail" colspan="3"><a href="#domain.spatial.CustomRefLocation">CustomRefLocation</a> <a href="#domain.spatial.StdRefLocation">StdRefLocation</a> 
                       </td>
                     </tr>
                   </table>
@@ -3116,13 +3031,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.temporal.RandomError"></a>2.7.2 objectType: RandomError
+    </div><br><h3><a name="domain.spatial.SpaceFrame"></a>2.6.6 objectType: SpaceFrame
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.temporal.RandomError</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.SpaceFrame</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -3139,11 +3054,16 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal">temporal</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.Error">Error [coords:domain.temporal.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coords:CoordFrame]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="info-title">referrers</td>
+                      <td class="feature-detail" colspan="3"><a href="#AstroCoordSystem">AstroCoordSystem</a> 
+                      </td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3154,13 +3074,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.RandomError.randError"></a><b>randError</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SpaceFrame.spaceRefFrame"></a><b>spaceRefFrame</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.StdRefFrame">StdRefFrame [coords:domain.spatial.StdRefFrame]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.temporal.RandomError.randError</td>
+                      <td class="feature-detail">domain.spatial.SpaceFrame.spaceRefFrame</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -3173,6 +3093,32 @@
                         
                       </td>
                     </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SpaceFrame.equinox"></a><b>equinox</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.spatial.Epoch">Epoch [coords:domain.spatial.Epoch]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.spatial.SpaceFrame.equinox</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">0..1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">constraints</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" colspan="3">coordSpace:SpatialSpace[1]</td>
+                    </tr>
                   </table>
                 </td>
               </tr>
@@ -3180,13 +3126,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.temporal.Resolution"></a>2.7.3 objectType: Resolution
+    </div><br><h3><a name="domain.spatial.SpatialCoord"></a>2.6.7 dataType: SpatialCoord
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.temporal.Resolution</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.SpatialCoord</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -3203,38 +3149,15 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal">temporal</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.Error">Error [coords:domain.temporal.Error]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.Resolution.res"></a><b>res</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.temporal.Resolution.res</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td colspan="3" class="feature-detail"><a href="#MultiCoordValue">MultiCoordValue [coords:MultiCoordValue]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#domain.spatial.SpatialCoord1D">SpatialCoord1D</a> <a href="#domain.spatial.SpatialCoord2D">SpatialCoord2D</a> <a href="#domain.spatial.SpatialCoord3D">SpatialCoord3D</a> 
                       </td>
                     </tr>
                   </table>
@@ -3244,13 +3167,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.temporal.StatisticalError"></a>2.7.4 objectType: StatisticalError
+    </div><br><h3><a name="domain.spatial.SpatialCoord1D"></a>2.6.8 dataType: SpatialCoord1D
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.temporal.StatisticalError</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.SpatialCoord1D</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -3267,39 +3190,17 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal">temporal</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.Error">Error [coords:domain.temporal.Error]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.SpatialCoord">SpatialCoord [coords:domain.spatial.SpatialCoord]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.StatisticalError.statError"></a><b>statError</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.temporal.StatisticalError.statError</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td colspan="3" class="info-title">constraints</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td class="feature-detail" valign="top" colspan="3">cmpt:SpatialCoordValue[1]</td>
                     </tr>
                   </table>
                 </td>
@@ -3308,13 +3209,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.temporal.SystematicError"></a>2.7.5 objectType: SystematicError
+    </div><br><h3><a name="domain.spatial.SpatialCoord2D"></a>2.6.9 dataType: SpatialCoord2D
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.temporal.SystematicError</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.SpatialCoord2D</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -3331,39 +3232,17 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal">temporal</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.Error">Error [coords:domain.temporal.Error]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.SpatialCoord">SpatialCoord [coords:domain.spatial.SpatialCoord]</a></td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">attributes</td>
+                      <td colspan="3" class="info-title">constraints</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.SystematicError.sysError"></a><b>sysError</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.temporal.SystematicError.sysError</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td class="feature-detail" valign="top" colspan="3">cmpt:SpatialCoordValue[2]</td>
                     </tr>
                   </table>
                 </td>
@@ -3372,13 +3251,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.temporal.Time"></a>2.7.6 objectType: Time
+    </div><br><h3><a name="domain.spatial.SpatialCoord3D"></a>2.6.10 dataType: SpatialCoord3D
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.temporal.Time</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.SpatialCoord3D</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -3395,71 +3274,17 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal">temporal</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate [coords:DerivedCoordinate]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.Time.coord"></a><b>coord</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#coordsys">coordsys</a>:<a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html#domain.temporal.TimeCoord">domain.temporal.TimeCoord</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.temporal.Time.coord</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">compositions</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="domain.temporal.Time.error"></a><b>error</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#domain.temporal.Error">Error [coords:domain.temporal.Error]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.temporal.Time.error</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.SpatialCoord">SpatialCoord [coords:domain.spatial.SpatialCoord]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
+                      <td colspan="3" class="info-title">constraints</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td class="feature-detail" valign="top" colspan="3">cmpt:SpatialCoordValue[3]</td>
                     </tr>
                   </table>
                 </td>
@@ -3468,43 +3293,19 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dtypes"></a>2.8 package: dtypes
-    </h3>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">dtypes</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">parent</td>
-        <td colspan="2" class="feature-detail"><a href="#model_section">coords</a></td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Data types</td>
-        <td colspan="2" class="feature-detail"><a href="#dtypes.Asymmetrical1D">Asymmetrical1D</a> <a href="#dtypes.Asymmetrical2D">Asymmetrical2D</a> <a href="#dtypes.Asymmetrical3D">Asymmetrical3D</a> <a href="#dtypes.Bounds1D">Bounds1D</a> <a href="#dtypes.Bounds2D">Bounds2D</a> <a href="#dtypes.Bounds3D">Bounds3D</a> <a href="#dtypes.CovarianceMatrix2D">CovarianceMatrix2D</a> <a href="#dtypes.CovarianceMatrix3D">CovarianceMatrix3D</a> <a href="#dtypes.Ellipse">Ellipse</a> <a href="#dtypes.Ellipsoid">Ellipsoid</a> <a href="#dtypes.Matrix">Matrix</a> <a href="#dtypes.Matrix2x2">Matrix2x2</a> <a href="#dtypes.Matrix3x3">Matrix3x3</a> <a href="#dtypes.Symmetrical1D">Symmetrical1D</a> <a href="#dtypes.Symmetrical2D">Symmetrical2D</a> <a href="#dtypes.Symmetrical3D">Symmetrical3D</a> <a href="#dtypes.Uncertainty">Uncertainty</a> <a href="#dtypes.Uncertainty1D">Uncertainty1D</a> <a href="#dtypes.Uncertainty2D">Uncertainty2D</a> <a href="#dtypes.Uncertainty3D">Uncertainty3D</a> 
-        </td>
-      </tr>
-    </table>
-    <h3><a name="dtypes.Asymmetrical1D"></a>2.8.1 dataType: Asymmetrical1D
+    </div><br><h3><a name="domain.spatial.SpatialCoordValue"></a>2.6.11 dataType: SpatialCoordValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Asymmetrical1D</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.SpatialCoordValue</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
+          <td class="feature-detail" colspan="1">An instance of a point along the associated axis.
+            NOTE: This represents an absolute point in the coordinate space and not a 'measured' value, which is defined in the coords
+            model.
           </td>
         </tr>
         <tr>
@@ -3515,59 +3316,17 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Asymmetrical1D.plus"></a><b>plus</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Asymmetrical1D.plus</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Asymmetrical1D.minus"></a><b>minus</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Asymmetrical1D.minus</td>
+                      <td colspan="3" class="feature-detail"><a href="#PhysicalCoordValue">PhysicalCoordValue [coords:PhysicalCoordValue]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td colspan="3" class="info-title">constraints</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td class="feature-detail" valign="top" colspan="3">cval:RealQuantity</td>
                     </tr>
                   </table>
                 </td>
@@ -3576,13 +3335,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dtypes.Asymmetrical2D"></a>2.8.2 dataType: Asymmetrical2D
+    </div><br><h3><a name="domain.spatial.SpatialSpace"></a>2.6.12 objectType: SpatialSpace
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Asymmetrical2D</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.SpatialSpace</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -3599,58 +3358,15 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Asymmetrical2D.plus"></a><b>plus</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Asymmetrical2D.plus</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">2</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordSpace">CoordSpace [coords:CoordSpace]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Asymmetrical2D.minus"></a><b>minus</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Asymmetrical2D.minus</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">2</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#domain.spatial.Cartesian">Cartesian</a> <a href="#domain.spatial.Spherical">Spherical</a> 
                       </td>
                     </tr>
                   </table>
@@ -3660,13 +3376,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dtypes.Asymmetrical3D"></a>2.8.3 dataType: Asymmetrical3D
+    </div><br><h3><a name="domain.spatial.Spherical"></a>2.6.13 objectType: Spherical
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Asymmetrical3D</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.Spherical</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -3683,11 +3399,11 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.SpatialSpace">SpatialSpace [coords:domain.spatial.SpatialSpace]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -3698,17 +3414,17 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Asymmetrical3D.plus"></a><b>plus</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.Spherical.handedness"></a><b>handedness</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
+                      <td class="feature-detail"><a href="#Handedness">Handedness [coords:Handedness]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Asymmetrical3D.plus</td>
+                      <td class="feature-detail">domain.spatial.Spherical.handedness</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">3</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -3718,24 +3434,10 @@
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Asymmetrical3D.minus"></a><b>minus</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Asymmetrical3D.minus</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">3</td>
+                      <td colspan="3" class="info-title">constraints</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td class="feature-detail" valign="top" colspan="3">coordAxis:PhysicalAxis[1..3]</td>
                     </tr>
                   </table>
                 </td>
@@ -3744,265 +3446,559 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dtypes.Bounds1D"></a>2.8.4 dataType: Bounds1D
+    </div><br><h3><a name="domain.spatial.StdRefFrame"></a>2.6.14 enumeration: StdRefFrame
     </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Bounds1D</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Bounds1D.loLimit"></a><b>loLimit</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Bounds1D.loLimit</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Bounds1D.hiLimit"></a><b>hiLimit</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Bounds1D.hiLimit</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="dtypes.Bounds2D"></a>2.8.5 dataType: Bounds2D
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Bounds2D</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Bounds2D.loLimit"></a><b>loLimit</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Bounds2D.loLimit</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">2</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Bounds2D.hiLimit"></a><b>hiLimit</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Bounds2D.hiLimit</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">2</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="dtypes.Bounds3D"></a>2.8.6 dataType: Bounds3D
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Bounds3D</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Bounds3D.loLimit"></a><b>loLimit</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Bounds3D.loLimit</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">2</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Bounds3D.hiLimit"></a><b>hiLimit</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Bounds3D.hiLimit</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">2</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="dtypes.CovarianceMatrix2D"></a>2.8.7 dataType: CovarianceMatrix2D
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="2">domain.spatial.StdRefFrame</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="2">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+      </tr>
+      <tr>
+        <td colspan="3" class="info-title" align="center">literals</td>
+      </tr>
+      <tr>
+        <td class="feature-heading" width="25%">name</td>
+        <td class="feature-heading" width="25%">feature</td>
+        <td class="feature-heading" width="50%">value</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.ICRS"></a>ICRS
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.ICRS</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.FK4"></a>FK4
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.FK4</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.FK5"></a>FK5
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.FK5</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.ECLIPTIC"></a>ECLIPTIC
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.ECLIPTIC</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.GALACTIC_I"></a>GALACTIC_I
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.GALACTIC_I</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.GALACTIC_II"></a>GALACTIC_II
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.GALACTIC_II</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.SUPER_GALACTIC"></a>SUPER_GALACTIC
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.SUPER_GALACTIC</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.AZ_EL"></a>AZ_EL
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.AZ_EL</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.BODY"></a>BODY
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.BODY</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.GEO_C"></a>GEO_C
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.GEO_C</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.GEO_D"></a>GEO_D
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.GEO_D</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.MAG"></a>MAG
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.MAG</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.GSE"></a>GSE
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.GSE</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.GSM"></a>GSM
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.GSM</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.SM"></a>SM
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.SM</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.HGC"></a>HGC
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.HGC</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.HEE"></a>HEE
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.HEE</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.HEEQ"></a>HEEQ
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.HEEQ</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.HCI"></a>HCI
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.HCI</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.HCD"></a>HCD
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.HCD</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.MERCURY_C"></a>MERCURY_C
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.MERCURY_C</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.VENUS_C"></a>VENUS_C
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.VENUS_C</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.LUNA_C"></a>LUNA_C
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.LUNA_C</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.MARS_C"></a>MARS_C
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.MARS_C</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.JUPITER_C_III"></a>JUPITER_C_III
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.JUPITER_C_III</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.SATURN_C_III"></a>SATURN_C_III
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.SATURN_C_III</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.URANUS_C_III"></a>URANUS_C_III
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.URANUS_C_III</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.NEPTUNE_C_III"></a>NEPTUNE_C_III
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.NEPTUNE_C_III</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.PLUTO_C"></a>PLUTO_C
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.PLUTO_C</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.MERCURY_G"></a>MERCURY_G
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.MERCURY_G</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.VENUS_G"></a>VENUS_G
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.VENUS_G</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.LUNA_G"></a>LUNA_G
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.LUNA_G</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.MARS_G"></a>MARS_G
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.MARS_G</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.JUPITER_G_III"></a>JUPITER_G_III
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.JUPITER_G_III</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.SATURN_G_III"></a>SATURN_G_III
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.SATURN_G_III</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.URANUS_G_III"></a>URANUS_G_III
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.URANUS_G_III</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.NEPTUNE_G_III"></a>NEPTUNE_G_III
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.NEPTUNE_G_III</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.PLUTO_G"></a>PLUTO_G
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.PLUTO_G</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.UNKNOWN"></a>UNKNOWN
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.UNKNOWN</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefFrame.CUSTOM"></a>CUSTOM
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefFrame.CUSTOM</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+    </table><br><h3><a name="domain.spatial.StdRefLocation"></a>2.6.15 dataType: StdRefLocation
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.CovarianceMatrix2D</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.StdRefLocation</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -4019,11 +4015,11 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.RefLocation">RefLocation [coords:domain.spatial.RefLocation]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -4034,13 +4030,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.CovarianceMatrix2D.matrix"></a><b>matrix</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.StdRefLocation.position"></a><b>position</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Matrix2x2">Matrix2x2 [coords:dtypes.Matrix2x2]</a></td>
+                      <td class="feature-detail"><a href="#domain.spatial.StdRefPosition">StdRefPosition [coords:domain.spatial.StdRefPosition]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.CovarianceMatrix2D.matrix</td>
+                      <td class="feature-detail">domain.spatial.StdRefLocation.position</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -4060,250 +4056,405 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dtypes.CovarianceMatrix3D"></a>2.8.8 dataType: CovarianceMatrix3D
+    </div><br><h3><a name="domain.spatial.StdRefPosition"></a>2.6.16 enumeration: StdRefPosition
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="2">domain.spatial.StdRefPosition</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="2">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+      </tr>
+      <tr>
+        <td colspan="3" class="info-title" align="center">literals</td>
+      </tr>
+      <tr>
+        <td class="feature-heading" width="25%">name</td>
+        <td class="feature-heading" width="25%">feature</td>
+        <td class="feature-heading" width="50%">value</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.TOPOCENTER"></a>TOPOCENTER
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.TOPOCENTER</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.BARYCENTER"></a>BARYCENTER
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.BARYCENTER</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.HELIOCENTER"></a>HELIOCENTER
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.HELIOCENTER</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.GEOCENTER"></a>GEOCENTER
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.GEOCENTER</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.GALACTIC_CENTER"></a>GALACTIC_CENTER
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.GALACTIC_CENTER</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.LOCAL_GROUP_CENTER"></a>LOCAL_GROUP_CENTER
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.LOCAL_GROUP_CENTER</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.MOON"></a>MOON
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.MOON</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.EMBARYCENTER"></a>EMBARYCENTER
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.EMBARYCENTER</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.MERCURY"></a>MERCURY
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.MERCURY</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.VENUS"></a>VENUS
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.VENUS</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.MARS"></a>MARS
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.MARS</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.JUPITER"></a>JUPITER
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.JUPITER</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.SATURN"></a>SATURN
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.SATURN</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.URANUS"></a>URANUS
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.URANUS</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.NEPTUNE"></a>NEPTUNE
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.NEPTUNE</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.PLUTO"></a>PLUTO
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.PLUTO</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.RELOCATABLE"></a>RELOCATABLE
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.RELOCATABLE</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.LSR"></a>LSR
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.LSR</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.LSRK"></a>LSRK
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.LSRK</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.LSRD"></a>LSRD
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.LSRD</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.UNKNOWN"></a>UNKNOWN
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.UNKNOWN</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.spatial.StdRefPosition.CUSTOM"></a>CUSTOM
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.spatial.StdRefPosition.CUSTOM</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+    </table><br><h3><a name="domain.spectral"></a>2.7 package: spectral
     </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.CovarianceMatrix3D</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.CovarianceMatrix3D.matrix"></a><b>matrix</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#dtypes.Matrix3x3">Matrix3x3 [coords:dtypes.Matrix3x3]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.CovarianceMatrix3D.matrix</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="dtypes.Ellipse"></a>2.8.9 dataType: Ellipse
+    <table border="1" cellspacing="2" width="100%">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">domain.spectral</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">Implementation of the Coordinate Frame pattern for the Spectral domain.
+          This is a basic 1-Dimensional coordinate space.
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">parent</td>
+        <td colspan="2" class="feature-detail"><a href="#domain">domain</a></td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Object types</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.spectral.SpectralFrame">SpectralFrame</a> <a href="#domain.spectral.SpectralSpace">SpectralSpace</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Data types</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.spectral.SpectralValue">SpectralValue</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Primitive types</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.spectral.Energy">Energy</a> <a href="#domain.spectral.Frequency">Frequency</a> <a href="#domain.spectral.Wavelength">Wavelength</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Parent package</td>
+        <td colspan="2" class="feature-detail"><a href="#domain">domain</a> 
+        </td>
+      </tr>
+    </table>
+    <h3><a name="domain.spectral.Energy"></a>2.7.1 primitiveType: Energy
     </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Ellipse</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Ellipse.semiAxis"></a><b>semiAxis</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Ellipse.semiAxis</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">2</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Ellipse.posAngle"></a><b>posAngle</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Ellipse.posAngle</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="dtypes.Ellipsoid"></a>2.8.10 dataType: Ellipsoid
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">domain.spectral.Energy</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
+      </tr>
+    </table><br><h3><a name="domain.spectral.Frequency"></a>2.7.2 primitiveType: Frequency
     </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Ellipsoid</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Ellipsoid.semiAxis"></a><b>semiAxis</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Ellipsoid.semiAxis</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">3</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Ellipsoid.posAngle"></a><b>posAngle</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Ellipsoid.posAngle</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">2</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="dtypes.Matrix"></a>2.8.11 dataType: Matrix
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">domain.spectral.Frequency</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
+      </tr>
+    </table><br><h3><a name="domain.spectral.SpectralFrame"></a>2.7.3 objectType: SpectralFrame
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Matrix</td>
+          <td class="objecttype-name" colspan="1">domain.spectral.SpectralFrame</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
+          <td class="feature-detail" colspan="1">origin: 0.0
+            dimensionality: 1D
+            orientation: n/a
             
           </td>
         </tr>
@@ -4315,13 +4466,23 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
                     </tr>
                     <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#dtypes.Matrix2x2">Matrix2x2</a> <a href="#dtypes.Matrix3x3">Matrix3x3</a> 
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coords:CoordFrame]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="info-title">referrers</td>
+                      <td class="feature-detail" colspan="3"><a href="#AstroCoordSystem">AstroCoordSystem</a> 
                       </td>
                     </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">constraints</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" colspan="3">coordSpace:SpectralSpace[1]</td>
+                    </tr>
                   </table>
                 </td>
               </tr>
@@ -4329,13 +4490,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dtypes.Matrix2x2"></a>2.8.12 dataType: Matrix2x2
+    </div><br><h3><a name="domain.spectral.SpectralSpace"></a>2.7.4 objectType: SpectralSpace
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Matrix2x2</td>
+          <td class="objecttype-name" colspan="1">domain.spectral.SpectralSpace</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -4352,99 +4513,17 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Matrix">Matrix [coords:dtypes.Matrix]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Matrix2x2.m11"></a><b>m11</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#real">real</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Matrix2x2.m11</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Matrix2x2.m12"></a><b>m12</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#real">real</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Matrix2x2.m12</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Matrix2x2.m21"></a><b>m21</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#real">real</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Matrix2x2.m21</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Matrix2x2.m22"></a><b>m22</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#real">real</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Matrix2x2.m22</td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordSpace">CoordSpace [coords:CoordSpace]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td colspan="3" class="info-title">constraints</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td class="feature-detail" valign="top" colspan="3">coordAxis:PhysicalAxis[1]</td>
                     </tr>
                   </table>
                 </td>
@@ -4453,13 +4532,13 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dtypes.Matrix3x3"></a>2.8.13 dataType: Matrix3x3
+    </div><br><h3><a name="domain.spectral.SpectralValue"></a>2.7.5 dataType: SpectralValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Matrix3x3</td>
+          <td class="objecttype-name" colspan="1">domain.spectral.SpectralValue</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -4476,199 +4555,22 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
-                    </tr>
-                    <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Matrix">Matrix [coords:dtypes.Matrix]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Matrix3x3.m11"></a><b>m11</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#real">real</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Matrix3x3.m11</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Matrix3x3.m12"></a><b>m12</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#real">real</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Matrix3x3.m12</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Matrix3x3.m13"></a><b>m13</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#real">real</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Matrix3x3.m13</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Matrix3x3.m21"></a><b>m21</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#real">real</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Matrix3x3.m21</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Matrix3x3.m22"></a><b>m22</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#real">real</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Matrix3x3.m22</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Matrix3x3.m23"></a><b>m23</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#real">real</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Matrix3x3.m23</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Matrix3x3.m31"></a><b>m31</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#real">real</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Matrix3x3.m31</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Matrix3x3.m32"></a><b>m32</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#real">real</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Matrix3x3.m32</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
                     </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Matrix3x3.m33"></a><b>m33</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#real">real</a></td>
+                    <tr>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#PhysicalCoordValue">PhysicalCoordValue [coords:PhysicalCoordValue]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Matrix3x3.m33</td>
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#domain.spectral.Energy">Energy</a> <a href="#domain.spectral.Frequency">Frequency</a> <a href="#domain.spectral.Wavelength">Wavelength</a> 
+                      </td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td colspan="3" class="info-title">constraints</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td class="feature-detail" valign="top" colspan="3">cval:RealQuantity</td>
                     </tr>
                   </table>
                 </td>
@@ -4677,19 +4579,74 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dtypes.Symmetrical1D"></a>2.8.14 dataType: Symmetrical1D
+    </div><br><h3><a name="domain.spectral.Wavelength"></a>2.7.6 primitiveType: Wavelength
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">domain.spectral.Wavelength</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
+      </tr>
+    </table><br><h3><a name="domain.temporal"></a>2.8 package: temporal
+    </h3>
+    <table border="1" cellspacing="2" width="100%">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="1">domain.temporal</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="1">Implementation of the Coordinate Frame pattern for the Time domain.
+          This is a basic 1-Dimensional coordinate space.
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">parent</td>
+        <td colspan="2" class="feature-detail"><a href="#domain">domain</a></td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Object types</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.temporal.TimeFrame">TimeFrame</a> <a href="#domain.temporal.TimeSpace">TimeSpace</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Data types</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.temporal.ISOTime">ISOTime</a> <a href="#domain.temporal.TimeOffset">TimeOffset</a> <a href="#domain.temporal.TimeStamp">TimeStamp</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Enumerations</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.temporal.TimeScale">TimeScale</a> 
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">Parent package</td>
+        <td colspan="2" class="feature-detail"><a href="#domain">domain</a> 
+        </td>
+      </tr>
+    </table>
+    <h3><a name="domain.temporal.ISOTime"></a>2.8.1 dataType: ISOTime
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Symmetrical1D</td>
+          <td class="objecttype-name" colspan="1">domain.temporal.ISOTime</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
+          <td class="feature-detail" colspan="1">The time is represented as a particular instant.  While interchangable with the TimeOffset, this form typically has a defined
+            structure in representation.
           </td>
         </tr>
         <tr>
@@ -4700,39 +4657,17 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.temporal">temporal</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty1D">Uncertainty1D [coords:dtypes.Uncertainty1D]</a></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">attributes</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.TimeStamp">TimeStamp [coords:domain.temporal.TimeStamp]</a></td>
                     </tr>
                     <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Symmetrical1D.radius"></a><b>radius</b></td>
-                      <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Symmetrical1D.radius</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td colspan="3" class="info-title">constraints</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
-                      </td>
+                      <td class="feature-detail" valign="top" colspan="3">cval:DateTimeQuantity</td>
                     </tr>
                   </table>
                 </td>
@@ -4741,18 +4676,19 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dtypes.Symmetrical2D"></a>2.8.15 dataType: Symmetrical2D
+    </div><br><h3><a name="domain.temporal.TimeFrame"></a>2.8.2 objectType: TimeFrame
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Symmetrical2D</td>
+          <td class="objecttype-name" colspan="1">domain.temporal.TimeFrame</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
+          <td class="feature-detail" colspan="1">origin: implied
+            dimensionality: 1D
+            orientation: n/a
             
           </td>
         </tr>
@@ -4764,11 +4700,16 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.temporal">temporal</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty2D">Uncertainty2D [coords:dtypes.Uncertainty2D]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordFrame">CoordFrame [coords:CoordFrame]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="info-title">referrers</td>
+                      <td class="feature-detail" colspan="3"><a href="#AstroCoordSystem">AstroCoordSystem</a> 
+                      </td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -4779,13 +4720,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Symmetrical2D.radius"></a><b>radius</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.TimeFrame.timescale"></a><b>timescale</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
+                      <td class="feature-detail"><a href="#domain.temporal.TimeScale">TimeScale [coords:domain.temporal.TimeScale]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Symmetrical2D.radius</td>
+                      <td class="feature-detail">domain.temporal.TimeFrame.timescale</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -4798,62 +4739,38 @@
                         
                       </td>
                     </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="dtypes.Symmetrical3D"></a>2.8.16 dataType: Symmetrical3D
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Symmetrical3D</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.TimeFrame.refDirection"></a><b>refDirection</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.spatial.RefLocation">RefLocation [coords:domain.spatial.RefLocation]</a></td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty3D">Uncertainty3D [coords:dtypes.Uncertainty3D]</a></td>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.temporal.TimeFrame.refDirection</td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">attributes</td>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading" width="20%">name</td>
-                      <td class="feature-heading" width="10%">feature</td>
-                      <td class="feature-heading" width="70%">value</td>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="dtypes.Symmetrical3D.radius"></a><b>radius</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.TimeFrame.time0"></a><b>time0</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
+                      <td class="feature-detail"><a href="#domain.temporal.TimeStamp">TimeStamp [coords:domain.temporal.TimeStamp]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">dtypes.Symmetrical3D.radius</td>
+                      <td class="feature-detail">domain.temporal.TimeFrame.time0</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</td>
+                      <td class="feature-detail">0..1</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
@@ -4862,6 +4779,12 @@
                         
                       </td>
                     </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">constraints</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" colspan="3">coordSpace:TimeSpace[1]</td>
+                    </tr>
                   </table>
                 </td>
               </tr>
@@ -4869,20 +4792,17 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dtypes.Uncertainty"></a>2.8.17 dataType: Uncertainty
+    </div><br><h3><a name="domain.temporal.TimeOffset"></a>2.8.3 dataType: TimeOffset
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Uncertainty</td>
+          <td class="objecttype-name" colspan="1">domain.temporal.TimeOffset</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
+          <td class="feature-detail" colspan="1">The time coordinate is represented as an offset from the origin.</td>
         </tr>
         <tr>
           <td colspan="2">
@@ -4892,12 +4812,17 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.temporal">temporal</a></td>
                     </tr>
                     <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#dtypes.Uncertainty1D">Uncertainty1D</a> <a href="#dtypes.Uncertainty2D">Uncertainty2D</a> <a href="#dtypes.Uncertainty3D">Uncertainty3D</a> 
-                      </td>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.TimeStamp">TimeStamp [coords:domain.temporal.TimeStamp]</a></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">constraints</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" colspan="3">cval:RealQuantity</td>
                     </tr>
                   </table>
                 </td>
@@ -4906,13 +4831,156 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dtypes.Uncertainty1D"></a>2.8.18 dataType: Uncertainty1D
+    </div><br><h3><a name="domain.temporal.TimeScale"></a>2.8.4 enumeration: TimeScale
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="2">domain.temporal.TimeScale</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="2">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td width="20%" class="info-title">package</td>
+        <td colspan="3" class="feature-detail"><a href="#domain.temporal">temporal</a></td>
+      </tr>
+      <tr>
+        <td colspan="3" class="info-title" align="center">literals</td>
+      </tr>
+      <tr>
+        <td class="feature-heading" width="25%">name</td>
+        <td class="feature-heading" width="25%">feature</td>
+        <td class="feature-heading" width="50%">value</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.temporal.TimeScale.TT"></a>TT
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.temporal.TimeScale.TT</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.temporal.TimeScale.ET"></a>ET
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.temporal.TimeScale.ET</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.temporal.TimeScale.TDB"></a>TDB
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.temporal.TimeScale.TDB</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.temporal.TimeScale.TCG"></a>TCG
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.temporal.TimeScale.TCG</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.temporal.TimeScale.TCB"></a>TCB
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.temporal.TimeScale.TCB</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.temporal.TimeScale.TAI"></a>TAI
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.temporal.TimeScale.TAI</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.temporal.TimeScale.UTC"></a>UTC
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.temporal.TimeScale.UTC</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.temporal.TimeScale.LST"></a>LST
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.temporal.TimeScale.LST</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="domain.temporal.TimeScale.LOCAL"></a>LOCAL
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">domain.temporal.TimeScale.LOCAL</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+    </table><br><h3><a name="domain.temporal.TimeSpace"></a>2.8.5 objectType: TimeSpace
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Uncertainty1D</td>
+          <td class="objecttype-name" colspan="1">domain.temporal.TimeSpace</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -4929,57 +4997,17 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.temporal">temporal</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty">Uncertainty [coords:dtypes.Uncertainty]</a></td>
-                    </tr>
-                    <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#dtypes.Asymmetrical1D">Asymmetrical1D</a> <a href="#dtypes.Bounds1D">Bounds1D</a> <a href="#dtypes.Symmetrical1D">Symmetrical1D</a> 
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </div><br><h3><a name="dtypes.Uncertainty2D"></a>2.8.19 dataType: Uncertainty2D
-    </h3>
-    <div align="center">
-      <table border="1" width="100%" cellspacing="2">
-        <tr>
-          <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Uncertainty2D</td>
-        </tr>
-        <tr>
-          <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <table width="100%" cellpadding="0" cellspacing="0" border="0">
-              <tr>
-                <td colspan="2" bgcolor="#cacaca">
-                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
-                    <tr>
-                      <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#CoordSpace">CoordSpace [coords:CoordSpace]</a></td>
                     </tr>
                     <tr>
-                      <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty">Uncertainty [coords:dtypes.Uncertainty]</a></td>
+                      <td colspan="3" class="info-title">constraints</td>
                     </tr>
                     <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#dtypes.Asymmetrical2D">Asymmetrical2D</a> <a href="#dtypes.Bounds2D">Bounds2D</a> <a href="#dtypes.CovarianceMatrix2D">CovarianceMatrix2D</a> <a href="#dtypes.Ellipse">Ellipse</a> <a href="#dtypes.Symmetrical2D">Symmetrical2D</a> 
-                      </td>
+                      <td class="feature-detail" valign="top" colspan="3">coordAxis:PhysicalAxis[1]</td>
                     </tr>
                   </table>
                 </td>
@@ -4988,19 +5016,19 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="dtypes.Uncertainty3D"></a>2.8.20 dataType: Uncertainty3D
+    </div><br><h3><a name="domain.temporal.TimeStamp"></a>2.8.6 dataType: TimeStamp
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">dtypes.Uncertainty3D</td>
+          <td class="objecttype-name" colspan="1">domain.temporal.TimeStamp</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
-          <td class="feature-detail" colspan="1">
-            TODO : Missing description : please, update your UML model asap.
-            
+          <td class="feature-detail" colspan="1">An instance of a point along the associated axis.
+            NOTE: This represents an absolute point in the coordinate space and not a 'measured' value, which is defined in the coords
+            model.
           </td>
         </tr>
         <tr>
@@ -5011,15 +5039,15 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">package</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes">dtypes</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.temporal">temporal</a></td>
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#dtypes.Uncertainty">Uncertainty [coords:dtypes.Uncertainty]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#PhysicalCoordValue">PhysicalCoordValue [coords:PhysicalCoordValue]</a></td>
                     </tr>
                     <tr>
                       <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#dtypes.Asymmetrical3D">Asymmetrical3D</a> <a href="#dtypes.Bounds3D">Bounds3D</a> <a href="#dtypes.CovarianceMatrix3D">CovarianceMatrix3D</a> <a href="#dtypes.Ellipsoid">Ellipsoid</a> <a href="#dtypes.Symmetrical3D">Symmetrical3D</a> 
+                      <td class="feature-detail" colspan="3"><a href="#domain.temporal.ISOTime">ISOTime</a> <a href="#domain.temporal.TimeOffset">TimeOffset</a> 
                       </td>
                     </tr>
                   </table>
@@ -5038,21 +5066,295 @@
     
     <table style="border-style:solid;border-width:1px;" border="1" cellspacing="0" cellpadding="0">
       <tr>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-heading">feature type</td>
-        <td class="feature-heading">description</td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-heading">feature type</td>
+        <td class="feature-heading">description</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#"></a></td>
+        <td class="feature-detail">vo-dml:model</td>
+        <td class="feature-detail">The coordsys model defines a pattern for Coordinate Frame specifications, various Coordinate System objects for bundling Coordinate
+          Frames into associated groups, and implements the CoordFrame pattern for several physical domains.  The expectation is that
+          as models are created which touch on domains not represented here, they will implement this pattern in the same fashion for
+          the new domain.  This implementation may reside in the other model, or be added to this list of implementations.  Models which
+          refer to the CoordFrame of this model are stating an expectation that the instances included follow the specified pattern.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#AstroCoordSystem">AstroCoordSystem</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">AstroCoordSystem is a container object for organizing physical Coordinate Frame specifications into related groupings.  The
+          object provides a references to Coordinate Frame instances in each of the known domain implementations.  As a whole, the AstroCoordSystem
+          should provide a complete description of the domain space. 
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#AstroCoordSystem.planetaryEphem">AstroCoordSystem.planetaryEphem</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#AstroCoordSystem.polarizationFrame">AstroCoordSystem.polarizationFrame</a></td>
+        <td class="feature-detail">reference</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#AstroCoordSystem.refPosition">AstroCoordSystem.refPosition</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#AstroCoordSystem.spaceFrame">AstroCoordSystem.spaceFrame</a></td>
+        <td class="feature-detail">reference</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#AstroCoordSystem.spectralFrame">AstroCoordSystem.spectralFrame</a></td>
+        <td class="feature-detail">reference</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#AstroCoordSystem.timeFrame">AstroCoordSystem.timeFrame</a></td>
+        <td class="feature-detail">reference</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Axis">Axis</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Axis.name">Axis.name</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#BasicCoordValue">BasicCoordValue</a></td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#BinnedCoordValue">BinnedCoordValue</a></td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#BinnedCoordValue.cval">BinnedCoordValue.cval</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#CoordFrame">CoordFrame</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#CoordFrame.coordSpace">CoordFrame.coordSpace</a></td>
+        <td class="feature-detail">composition</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#CoordSpace">CoordSpace</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#CoordSpace.coordAxis">CoordSpace.coordAxis</a></td>
+        <td class="feature-detail">composition</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#CoordSys">CoordSys</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">The CoordSys object is the parent of a set of containers for organizing Coordinate Frame specifications into related groupings.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#CoordSys.genericFrame">CoordSys.genericFrame</a></td>
+        <td class="feature-detail">reference</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#CoordValue">CoordValue</a></td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#CoordValue.coordAxis">CoordValue.coordAxis</a></td>
+        <td class="feature-detail">reference</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#DiscreteAxis">DiscreteAxis</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#DiscreteCoordValue">DiscreteCoordValue</a></td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Handedness">Handedness</a></td>
+        <td class="feature-detail">enumeration</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Handedness.left">Handedness.left</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Handedness.right">Handedness.right</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#MultiCoordValue">MultiCoordValue</a></td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#MultiCoordValue.cmpt">MultiCoordValue.cmpt</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#PhysicalAxis">PhysicalAxis</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#PhysicalAxis.cyclic">PhysicalAxis.cyclic</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#PhysicalAxis.domainMax">PhysicalAxis.domainMax</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#PhysicalAxis.domainMin">PhysicalAxis.domainMin</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#PhysicalCoordValue">PhysicalCoordValue</a></td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#"></a></td>
-        <td class="feature-detail">vo-dml:model</td>
+        <td class="feature-detail"><a href="#PhysicalCoordValue.cval">PhysicalCoordValue.cval</a></td>
+        <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#DerivedCoordinate">DerivedCoordinate</a></td>
+        <td class="feature-detail"><a href="#PixelCoordSystem">PixelCoordSystem</a></td>
         <td class="feature-detail">objectType</td>
+        <td class="feature-detail">The PixelCoordSystem contains the complete list of Pixel Frame specifications.  Here, the relation between the system and
+          its frames is different than in the physical CoordSys.  In the pixel domain, there is only 1 system, composed of a specific
+          set of PixelAxes organized in PixelFrames.
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#PixelCoordSystem.pixelFrame">PixelCoordSystem.pixelFrame</a></td>
+        <td class="feature-detail">composition</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
@@ -5061,29 +5363,55 @@
       <tr>
         <td class="feature-detail"><a href="#domain">domain</a></td>
         <td class="feature-detail">package</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
+        <td class="feature-detail">The Domain package contains implementations of the Coordinate Frame pattern for various physical domains.  Many of these domains
+          are 1-Dimensional and there is a good deal of consolidation which could take place in those domains (ie 1-1 relations could
+          get absorbed or eliminated).  However, the defined pattern satisfies ALL domains, and we feel the consistancy this generates
+          simplifies the understanding and implementation of the model.  If one understands the pattern, the interpretation of any domain
+          is straight-forward.
         </td>
       </tr>
       <tr>
         <td class="feature-detail"><a href="#domain.generic">domain.generic</a></td>
         <td class="feature-detail">package</td>
+        <td class="feature-detail">Implementation of the Coordinate Frame pattern for 'generic' domains.   The generic domain covers any domain not represented
+          by the specialized physical domains, and a specialized representation is not deemed necessary.
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.generic.GenericCoordSpace">domain.generic.GenericCoordSpace</a></td>
+        <td class="feature-detail">objectType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.generic.Error">domain.generic.Error</a></td>
+        <td class="feature-detail"><a href="#domain.generic.GenericCoordValue">domain.generic.GenericCoordValue</a></td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">An instance of a point along the associated axis.
+          NOTE: This represents an absolute point in the coordinate space and not a 'measured' value, which is defined in the coords
+          model.
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.generic.GenericFrame">domain.generic.GenericFrame</a></td>
         <td class="feature-detail">objectType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
+        <td class="feature-detail">origin: 0.0 
+          dimensionality: 1D
+          orientation: n/a
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.generic.Measurement">domain.generic.Measurement</a></td>
+        <td class="feature-detail"><a href="#domain.pixel">domain.pixel</a></td>
+        <td class="feature-detail">package</td>
+        <td class="feature-detail">This package implements the Coordinate Frame pattern for the Pixel domain.
+          The Pixel coordinate space is defined as a 'virtual' binned space, with no physical meaning.  The axes in this space provide
+          integer indexes into the space.
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.pixel.PixelAxis">domain.pixel.PixelAxis</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5091,7 +5419,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.generic.Measurement.coord">domain.generic.Measurement.coord</a></td>
+        <td class="feature-detail"><a href="#domain.pixel.PixelAxis.numPix">domain.pixel.PixelAxis.numPix</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5099,15 +5427,24 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.generic.Measurement.error">domain.generic.Measurement.error</a></td>
-        <td class="feature-detail">composition</td>
+        <td class="feature-detail"><a href="#domain.pixel.PixelFrame">domain.pixel.PixelFrame</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">origin: 0.0
+          dimensionality: 1..3
+          orientation: n/a
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.pixel.PixelIndex">domain.pixel.PixelIndex</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.generic.RandomError">domain.generic.RandomError</a></td>
+        <td class="feature-detail"><a href="#domain.pixel.PixelSpace">domain.pixel.PixelSpace</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5115,7 +5452,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.generic.RandomError.randError">domain.generic.RandomError.randError</a></td>
+        <td class="feature-detail"><a href="#domain.pixel.PixelSpace.handedness">domain.pixel.PixelSpace.handedness</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5123,15 +5460,23 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.generic.Resolution">domain.generic.Resolution</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.polarization">domain.polarization</a></td>
+        <td class="feature-detail">package</td>
+        <td class="feature-detail">Implementation of the Coordinate Frame pattern for the Polarization domain.
+          This is a 1-Dimensional coordinate space, but the nature of the polarization coordinate values (discrete enumerated strings)
+          requires a different axis specification.
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.polarization.PolCircular">domain.polarization.PolCircular</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.generic.Resolution.res">domain.generic.Resolution.res</a></td>
+        <td class="feature-detail"><a href="#domain.polarization.PolCircular.cval">domain.polarization.PolCircular.cval</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5139,55 +5484,63 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.generic.StatisticalError">domain.generic.StatisticalError</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolCircularEnum">domain.polarization.PolCircularEnum</a></td>
+        <td class="feature-detail">enumeration</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.generic.StatisticalError.statError">domain.generic.StatisticalError.statError</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolCircularEnum.LL">domain.polarization.PolCircularEnum.LL</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.generic.SystematicError">domain.generic.SystematicError</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolCircularEnum.LR">domain.polarization.PolCircularEnum.LR</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.generic.SystematicError.sysError">domain.generic.SystematicError.sysError</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolCircularEnum.RL">domain.polarization.PolCircularEnum.RL</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.polarization">domain.polarization</a></td>
-        <td class="feature-detail">package</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolCircularEnum.RR">domain.polarization.PolCircularEnum.RR</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.polarization.Circular">domain.polarization.Circular</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolCoordValue">domain.polarization.PolCoordValue</a></td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.polarization.PolLinear">domain.polarization.PolLinear</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.polarization.Circular.coord">domain.polarization.Circular.coord</a></td>
+        <td class="feature-detail"><a href="#domain.polarization.PolLinear.cval">domain.polarization.PolLinear.cval</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5195,55 +5548,55 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.polarization.DerivedPolarizationCoordinate">domain.polarization.DerivedPolarizationCoordinate</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolLinearEnum">domain.polarization.PolLinearEnum</a></td>
+        <td class="feature-detail">enumeration</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.polarization.Linear">domain.polarization.Linear</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolLinearEnum.XX">domain.polarization.PolLinearEnum.XX</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.polarization.Linear.coord">domain.polarization.Linear.coord</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolLinearEnum.XY">domain.polarization.PolLinearEnum.XY</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.polarization.Stokes">domain.polarization.Stokes</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolLinearEnum.YX">domain.polarization.PolLinearEnum.YX</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.polarization.Stokes.coord">domain.polarization.Stokes.coord</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolLinearEnum.YY">domain.polarization.PolLinearEnum.YY</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.polarization.Vector">domain.polarization.Vector</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolStokes">domain.polarization.PolStokes</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.polarization.Vector.coord">domain.polarization.Vector.coord</a></td>
+        <td class="feature-detail"><a href="#domain.polarization.PolStokes.cval">domain.polarization.PolStokes.cval</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5251,55 +5604,55 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial">domain.spatial</a></td>
-        <td class="feature-detail">package</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolStokesEnum">domain.polarization.PolStokesEnum</a></td>
+        <td class="feature-detail">enumeration</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Error1D">domain.spatial.Error1D</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolStokesEnum.I">domain.polarization.PolStokesEnum.I</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Error2D">domain.spatial.Error2D</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolStokesEnum.Q">domain.polarization.PolStokesEnum.Q</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Error3D">domain.spatial.Error3D</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolStokesEnum.U">domain.polarization.PolStokesEnum.U</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Position">domain.spatial.Position</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolStokesEnum.V">domain.polarization.PolStokesEnum.V</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Position1D">domain.spatial.Position1D</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolVector">domain.polarization.PolVector</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Position1D.coord">domain.spatial.Position1D.coord</a></td>
+        <td class="feature-detail"><a href="#domain.polarization.PolVector.cval">domain.polarization.PolVector.cval</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5307,63 +5660,72 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Position1D.error">domain.spatial.Position1D.error</a></td>
-        <td class="feature-detail">composition</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolVectorEnum">domain.polarization.PolVectorEnum</a></td>
+        <td class="feature-detail">enumeration</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Position2D">domain.spatial.Position2D</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolVectorEnum.I">domain.polarization.PolVectorEnum.I</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Position2D.coord">domain.spatial.Position2D.coord</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolVectorEnum.PA">domain.polarization.PolVectorEnum.PA</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Position2D.error">domain.spatial.Position2D.error</a></td>
-        <td class="feature-detail">composition</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolVectorEnum.PF">domain.polarization.PolVectorEnum.PF</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Position3D">domain.spatial.Position3D</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolVectorEnum.PP">domain.polarization.PolVectorEnum.PP</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Position3D.coord">domain.spatial.Position3D.coord</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolarizationFrame">domain.polarization.PolarizationFrame</a></td>
+        <td class="feature-detail">objectType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Position3D.error">domain.spatial.Position3D.error</a></td>
-        <td class="feature-detail">composition</td>
+        <td class="feature-detail"><a href="#domain.polarization.PolarizationSpace">domain.polarization.PolarizationSpace</a></td>
+        <td class="feature-detail">objectType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.RandomError1D">domain.spatial.RandomError1D</a></td>
+        <td class="feature-detail"><a href="#domain.spatial">domain.spatial</a></td>
+        <td class="feature-detail">package</td>
+        <td class="feature-detail">Implementation of the Coordinate Frame pattern for the Spatial domain.
+          This domain is relatively complex each property of the pattern ( origin, orientation, coordinate space ) has a non-trivial
+          definition and the domain has a higher level of dimensionality.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.spatial.Cartesian">domain.spatial.Cartesian</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5371,7 +5733,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.RandomError1D.randError">domain.spatial.RandomError1D.randError</a></td>
+        <td class="feature-detail"><a href="#domain.spatial.Cartesian.handedness">domain.spatial.Cartesian.handedness</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5379,15 +5741,15 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.RandomError2D">domain.spatial.RandomError2D</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.CustomRefLocation">domain.spatial.CustomRefLocation</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.RandomError2D.randError">domain.spatial.RandomError2D.randError</a></td>
+        <td class="feature-detail"><a href="#domain.spatial.CustomRefLocation.epoch">domain.spatial.CustomRefLocation.epoch</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5395,15 +5757,15 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.RandomError3D">domain.spatial.RandomError3D</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.CustomRefLocation.position">domain.spatial.CustomRefLocation.position</a></td>
+        <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.RandomError3D.randError">domain.spatial.RandomError3D.randError</a></td>
+        <td class="feature-detail"><a href="#domain.spatial.CustomRefLocation.velocity">domain.spatial.CustomRefLocation.velocity</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5411,15 +5773,15 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Resolution1D">domain.spatial.Resolution1D</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.Epoch">domain.spatial.Epoch</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Resolution1D.res">domain.spatial.Resolution1D.res</a></td>
+        <td class="feature-detail"><a href="#domain.spatial.Epoch.type">domain.spatial.Epoch.type</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5427,39 +5789,50 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Resolution2D">domain.spatial.Resolution2D</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.Epoch.year">domain.spatial.Epoch.year</a></td>
+        <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Resolution2D.res">domain.spatial.Resolution2D.res</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.EpochType">domain.spatial.EpochType</a></td>
+        <td class="feature-detail">enumeration</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Resolution3D">domain.spatial.Resolution3D</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.EpochType.B">domain.spatial.EpochType.B</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.Resolution3D.res">domain.spatial.Resolution3D.res</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.EpochType.J">domain.spatial.EpochType.J</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.StatisticalError1D">domain.spatial.StatisticalError1D</a></td>
+        <td class="feature-detail"><a href="#domain.spatial.RefLocation">domain.spatial.RefLocation</a></td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">RefLocation defines the origin of the spatial coordinate space.  This location is represented either by a standard reference
+          position, or a specified point in another Spatial frame.  This object is used as the origin of the SpaceFrame here, but also
+          to specify the Spatial Reference Position (refPosition) associated with other domain Frames.  For example, in the Time domain,
+          the Spatial Reference Position indicates that the 'time' values are the time that the 'event' occured at that location, which
+          may be different from the detector location.  
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.spatial.SpaceFrame">domain.spatial.SpaceFrame</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5467,7 +5840,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.StatisticalError1D.statError">domain.spatial.StatisticalError1D.statError</a></td>
+        <td class="feature-detail"><a href="#domain.spatial.SpaceFrame.equinox">domain.spatial.SpaceFrame.equinox</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5475,55 +5848,63 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.StatisticalError2D">domain.spatial.StatisticalError2D</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.SpaceFrame.spaceRefFrame">domain.spatial.SpaceFrame.spaceRefFrame</a></td>
+        <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.StatisticalError2D.statError">domain.spatial.StatisticalError2D.statError</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.SpatialCoord">domain.spatial.SpatialCoord</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.StatisticalError3D">domain.spatial.StatisticalError3D</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.SpatialCoord1D">domain.spatial.SpatialCoord1D</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.StatisticalError3D.statError">domain.spatial.StatisticalError3D.statError</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.SpatialCoord2D">domain.spatial.SpatialCoord2D</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.SystematicError1D">domain.spatial.SystematicError1D</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.SpatialCoord3D">domain.spatial.SpatialCoord3D</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.SystematicError1D.sysError">domain.spatial.SystematicError1D.sysError</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.SpatialCoordValue">domain.spatial.SpatialCoordValue</a></td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">An instance of a point along the associated axis.
+          NOTE: This represents an absolute point in the coordinate space and not a 'measured' value, which is defined in the coords
+          model.
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.spatial.SpatialSpace">domain.spatial.SpatialSpace</a></td>
+        <td class="feature-detail">objectType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.SystematicError2D">domain.spatial.SystematicError2D</a></td>
+        <td class="feature-detail"><a href="#domain.spatial.Spherical">domain.spatial.Spherical</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5531,7 +5912,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.SystematicError2D.sysError">domain.spatial.SystematicError2D.sysError</a></td>
+        <td class="feature-detail"><a href="#domain.spatial.Spherical.handedness">domain.spatial.Spherical.handedness</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5539,335 +5920,335 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.SystematicError3D">domain.spatial.SystematicError3D</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame">domain.spatial.StdRefFrame</a></td>
+        <td class="feature-detail">enumeration</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.SystematicError3D.sysError">domain.spatial.SystematicError3D.sysError</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.AZ_EL">domain.spatial.StdRefFrame.AZ_EL</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral">domain.spectral</a></td>
-        <td class="feature-detail">package</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.BODY">domain.spatial.StdRefFrame.BODY</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.DerivedSpectralCoordinate">domain.spectral.DerivedSpectralCoordinate</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.CUSTOM">domain.spatial.StdRefFrame.CUSTOM</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.DerivedSpectralCoordinate.coord">domain.spectral.DerivedSpectralCoordinate.coord</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.ECLIPTIC">domain.spatial.StdRefFrame.ECLIPTIC</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.DerivedSpectralCoordinate.error">domain.spectral.DerivedSpectralCoordinate.error</a></td>
-        <td class="feature-detail">composition</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.FK4">domain.spatial.StdRefFrame.FK4</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.Energy">domain.spectral.Energy</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.FK5">domain.spatial.StdRefFrame.FK5</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.Error">domain.spectral.Error</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.GALACTIC_I">domain.spatial.StdRefFrame.GALACTIC_I</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.Frequency">domain.spectral.Frequency</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.GALACTIC_II">domain.spatial.StdRefFrame.GALACTIC_II</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.RandomError">domain.spectral.RandomError</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.GEO_C">domain.spatial.StdRefFrame.GEO_C</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.RandomError.randError">domain.spectral.RandomError.randError</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.GEO_D">domain.spatial.StdRefFrame.GEO_D</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.Resolution">domain.spectral.Resolution</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.GSE">domain.spatial.StdRefFrame.GSE</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.Resolution.res">domain.spectral.Resolution.res</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.GSM">domain.spatial.StdRefFrame.GSM</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.StatisticalError">domain.spectral.StatisticalError</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.HCD">domain.spatial.StdRefFrame.HCD</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.StatisticalError.statError">domain.spectral.StatisticalError.statError</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.HCI">domain.spatial.StdRefFrame.HCI</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.SystematicError">domain.spectral.SystematicError</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.HEE">domain.spatial.StdRefFrame.HEE</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.SystematicError.sysError">domain.spectral.SystematicError.sysError</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.HEEQ">domain.spatial.StdRefFrame.HEEQ</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.Wavelength">domain.spectral.Wavelength</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.HGC">domain.spatial.StdRefFrame.HGC</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.temporal">domain.temporal</a></td>
-        <td class="feature-detail">package</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.ICRS">domain.spatial.StdRefFrame.ICRS</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.temporal.Error">domain.temporal.Error</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.JUPITER_C_III">domain.spatial.StdRefFrame.JUPITER_C_III</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.temporal.RandomError">domain.temporal.RandomError</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.JUPITER_G_III">domain.spatial.StdRefFrame.JUPITER_G_III</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.temporal.RandomError.randError">domain.temporal.RandomError.randError</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.LUNA_C">domain.spatial.StdRefFrame.LUNA_C</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.temporal.Resolution">domain.temporal.Resolution</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.LUNA_G">domain.spatial.StdRefFrame.LUNA_G</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.temporal.Resolution.res">domain.temporal.Resolution.res</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.MAG">domain.spatial.StdRefFrame.MAG</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.temporal.StatisticalError">domain.temporal.StatisticalError</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.MARS_C">domain.spatial.StdRefFrame.MARS_C</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.temporal.StatisticalError.statError">domain.temporal.StatisticalError.statError</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.MARS_G">domain.spatial.StdRefFrame.MARS_G</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.temporal.SystematicError">domain.temporal.SystematicError</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.MERCURY_C">domain.spatial.StdRefFrame.MERCURY_C</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.temporal.SystematicError.sysError">domain.temporal.SystematicError.sysError</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.MERCURY_G">domain.spatial.StdRefFrame.MERCURY_G</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.temporal.Time">domain.temporal.Time</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.NEPTUNE_C_III">domain.spatial.StdRefFrame.NEPTUNE_C_III</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.temporal.Time.coord">domain.temporal.Time.coord</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.NEPTUNE_G_III">domain.spatial.StdRefFrame.NEPTUNE_G_III</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.temporal.Time.error">domain.temporal.Time.error</a></td>
-        <td class="feature-detail">composition</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.PLUTO_C">domain.spatial.StdRefFrame.PLUTO_C</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes">dtypes</a></td>
-        <td class="feature-detail">package</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.PLUTO_G">domain.spatial.StdRefFrame.PLUTO_G</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Asymmetrical1D">dtypes.Asymmetrical1D</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.SATURN_C_III">domain.spatial.StdRefFrame.SATURN_C_III</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Asymmetrical1D.minus">dtypes.Asymmetrical1D.minus</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.SATURN_G_III">domain.spatial.StdRefFrame.SATURN_G_III</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Asymmetrical1D.plus">dtypes.Asymmetrical1D.plus</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.SM">domain.spatial.StdRefFrame.SM</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Asymmetrical2D">dtypes.Asymmetrical2D</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.SUPER_GALACTIC">domain.spatial.StdRefFrame.SUPER_GALACTIC</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Asymmetrical2D.minus">dtypes.Asymmetrical2D.minus</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.UNKNOWN">domain.spatial.StdRefFrame.UNKNOWN</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Asymmetrical2D.plus">dtypes.Asymmetrical2D.plus</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.URANUS_C_III">domain.spatial.StdRefFrame.URANUS_C_III</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Asymmetrical3D">dtypes.Asymmetrical3D</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.URANUS_G_III">domain.spatial.StdRefFrame.URANUS_G_III</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Asymmetrical3D.minus">dtypes.Asymmetrical3D.minus</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.VENUS_C">domain.spatial.StdRefFrame.VENUS_C</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Asymmetrical3D.plus">dtypes.Asymmetrical3D.plus</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefFrame.VENUS_G">domain.spatial.StdRefFrame.VENUS_G</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Bounds1D">dtypes.Bounds1D</a></td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefLocation">domain.spatial.StdRefLocation</a></td>
         <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5875,7 +6256,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Bounds1D.hiLimit">dtypes.Bounds1D.hiLimit</a></td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefLocation.position">domain.spatial.StdRefLocation.position</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -5883,239 +6264,270 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Bounds1D.loLimit">dtypes.Bounds1D.loLimit</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition">domain.spatial.StdRefPosition</a></td>
+        <td class="feature-detail">enumeration</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Bounds2D">dtypes.Bounds2D</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.BARYCENTER">domain.spatial.StdRefPosition.BARYCENTER</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Bounds2D.hiLimit">dtypes.Bounds2D.hiLimit</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.CUSTOM">domain.spatial.StdRefPosition.CUSTOM</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Bounds2D.loLimit">dtypes.Bounds2D.loLimit</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.EMBARYCENTER">domain.spatial.StdRefPosition.EMBARYCENTER</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Bounds3D">dtypes.Bounds3D</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.GALACTIC_CENTER">domain.spatial.StdRefPosition.GALACTIC_CENTER</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Bounds3D.hiLimit">dtypes.Bounds3D.hiLimit</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.GEOCENTER">domain.spatial.StdRefPosition.GEOCENTER</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Bounds3D.loLimit">dtypes.Bounds3D.loLimit</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.HELIOCENTER">domain.spatial.StdRefPosition.HELIOCENTER</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.CovarianceMatrix2D">dtypes.CovarianceMatrix2D</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.JUPITER">domain.spatial.StdRefPosition.JUPITER</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.CovarianceMatrix2D.matrix">dtypes.CovarianceMatrix2D.matrix</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.LOCAL_GROUP_CENTER">domain.spatial.StdRefPosition.LOCAL_GROUP_CENTER</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.CovarianceMatrix3D">dtypes.CovarianceMatrix3D</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.LSR">domain.spatial.StdRefPosition.LSR</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.CovarianceMatrix3D.matrix">dtypes.CovarianceMatrix3D.matrix</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.LSRD">domain.spatial.StdRefPosition.LSRD</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Ellipse">dtypes.Ellipse</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.LSRK">domain.spatial.StdRefPosition.LSRK</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Ellipse.posAngle">dtypes.Ellipse.posAngle</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.MARS">domain.spatial.StdRefPosition.MARS</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Ellipse.semiAxis">dtypes.Ellipse.semiAxis</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.MERCURY">domain.spatial.StdRefPosition.MERCURY</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Ellipsoid">dtypes.Ellipsoid</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.MOON">domain.spatial.StdRefPosition.MOON</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Ellipsoid.posAngle">dtypes.Ellipsoid.posAngle</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.NEPTUNE">domain.spatial.StdRefPosition.NEPTUNE</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Ellipsoid.semiAxis">dtypes.Ellipsoid.semiAxis</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.PLUTO">domain.spatial.StdRefPosition.PLUTO</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Matrix">dtypes.Matrix</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.RELOCATABLE">domain.spatial.StdRefPosition.RELOCATABLE</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Matrix2x2">dtypes.Matrix2x2</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.SATURN">domain.spatial.StdRefPosition.SATURN</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Matrix2x2.m11">dtypes.Matrix2x2.m11</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.TOPOCENTER">domain.spatial.StdRefPosition.TOPOCENTER</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Matrix2x2.m12">dtypes.Matrix2x2.m12</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.UNKNOWN">domain.spatial.StdRefPosition.UNKNOWN</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Matrix2x2.m21">dtypes.Matrix2x2.m21</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.URANUS">domain.spatial.StdRefPosition.URANUS</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Matrix2x2.m22">dtypes.Matrix2x2.m22</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spatial.StdRefPosition.VENUS">domain.spatial.StdRefPosition.VENUS</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Matrix3x3">dtypes.Matrix3x3</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.spectral">domain.spectral</a></td>
+        <td class="feature-detail">package</td>
+        <td class="feature-detail">Implementation of the Coordinate Frame pattern for the Spectral domain.
+          This is a basic 1-Dimensional coordinate space.
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.spectral.Energy">domain.spectral.Energy</a></td>
+        <td class="feature-detail">primitiveType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Matrix3x3.m11">dtypes.Matrix3x3.m11</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spectral.Frequency">domain.spectral.Frequency</a></td>
+        <td class="feature-detail">primitiveType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Matrix3x3.m12">dtypes.Matrix3x3.m12</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
+        <td class="feature-detail"><a href="#domain.spectral.SpectralFrame">domain.spectral.SpectralFrame</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">origin: 0.0
+          dimensionality: 1D
+          orientation: n/a
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Matrix3x3.m13">dtypes.Matrix3x3.m13</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spectral.SpectralSpace">domain.spectral.SpectralSpace</a></td>
+        <td class="feature-detail">objectType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Matrix3x3.m21">dtypes.Matrix3x3.m21</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spectral.SpectralValue">domain.spectral.SpectralValue</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Matrix3x3.m22">dtypes.Matrix3x3.m22</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.spectral.Wavelength">domain.spectral.Wavelength</a></td>
+        <td class="feature-detail">primitiveType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Matrix3x3.m23">dtypes.Matrix3x3.m23</a></td>
+        <td class="feature-detail"><a href="#domain.temporal">domain.temporal</a></td>
+        <td class="feature-detail">package</td>
+        <td class="feature-detail">Implementation of the Coordinate Frame pattern for the Time domain.
+          This is a basic 1-Dimensional coordinate space.
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.temporal.ISOTime">domain.temporal.ISOTime</a></td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">The time is represented as a particular instant.  While interchangable with the TimeOffset, this form typically has a defined
+          structure in representation.
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.temporal.TimeFrame">domain.temporal.TimeFrame</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">origin: implied
+          dimensionality: 1D
+          orientation: n/a
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.temporal.TimeFrame.refDirection">domain.temporal.TimeFrame.refDirection</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -6123,7 +6535,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Matrix3x3.m31">dtypes.Matrix3x3.m31</a></td>
+        <td class="feature-detail"><a href="#domain.temporal.TimeFrame.time0">domain.temporal.TimeFrame.time0</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -6131,7 +6543,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Matrix3x3.m32">dtypes.Matrix3x3.m32</a></td>
+        <td class="feature-detail"><a href="#domain.temporal.TimeFrame.timescale">domain.temporal.TimeFrame.timescale</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -6139,93 +6551,106 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Matrix3x3.m33">dtypes.Matrix3x3.m33</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.temporal.TimeOffset">domain.temporal.TimeOffset</a></td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">The time coordinate is represented as an offset from the origin.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.temporal.TimeScale">domain.temporal.TimeScale</a></td>
+        <td class="feature-detail">enumeration</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Symmetrical1D">dtypes.Symmetrical1D</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.temporal.TimeScale.ET">domain.temporal.TimeScale.ET</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Symmetrical1D.radius">dtypes.Symmetrical1D.radius</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.temporal.TimeScale.LOCAL">domain.temporal.TimeScale.LOCAL</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Symmetrical2D">dtypes.Symmetrical2D</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.temporal.TimeScale.LST">domain.temporal.TimeScale.LST</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Symmetrical2D.radius">dtypes.Symmetrical2D.radius</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.temporal.TimeScale.TAI">domain.temporal.TimeScale.TAI</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Symmetrical3D">dtypes.Symmetrical3D</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.temporal.TimeScale.TCB">domain.temporal.TimeScale.TCB</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Symmetrical3D.radius">dtypes.Symmetrical3D.radius</a></td>
-        <td class="feature-detail">attribute</td>
+        <td class="feature-detail"><a href="#domain.temporal.TimeScale.TCG">domain.temporal.TimeScale.TCG</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Uncertainty">dtypes.Uncertainty</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.temporal.TimeScale.TDB">domain.temporal.TimeScale.TDB</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Uncertainty1D">dtypes.Uncertainty1D</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.temporal.TimeScale.TT">domain.temporal.TimeScale.TT</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Uncertainty2D">dtypes.Uncertainty2D</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.temporal.TimeScale.UTC">domain.temporal.TimeScale.UTC</a></td>
+        <td class="feature-detail">literal</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#dtypes.Uncertainty3D">dtypes.Uncertainty3D</a></td>
-        <td class="feature-detail">dataType</td>
+        <td class="feature-detail"><a href="#domain.temporal.TimeSpace">domain.temporal.TimeSpace</a></td>
+        <td class="feature-detail">objectType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.temporal.TimeStamp">domain.temporal.TimeStamp</a></td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">An instance of a point along the associated axis.
+          NOTE: This represents an absolute point in the coordinate space and not a 'measured' value, which is defined in the coords
+          model.
+        </td>
+      </tr>
     </table>
     <hr>
     <h1>4.<a name="modelimports">Imported Models</a></h1>
@@ -6233,23 +6658,7 @@
       For each imported model we list URLs to the VO-DML and HTML representations and the prefix used for vodml-ids from inside
       the model.
     </p>
-    <h2><a name="coordsys"></a>4.1 coordsys
-    </h2>
-    <table border="1" cellspacing="2" width="100%">
-      <tr>
-        <td class="objecttype-title" width="20%">Model vodml-id</td>
-        <td class="objecttype-name">coordsys</td>
-      </tr>
-      <tr>
-        <td width="30%" class="info-title">url</td>
-        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.vo-dml.xml</a></td>
-      </tr>
-      <tr>
-        <td width="30%" class="info-title">documentation url</td>
-        <td><a href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html">https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html</a></td>
-      </tr>
-    </table>
-    <h2><a name="ivoa"></a>4.2 ivoa
+    <h2><a name="ivoa"></a>4.1 ivoa
     </h2>
     <table border="1" cellspacing="2" width="100%">
       <tr>

Modified: trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml
==============================================================================
--- trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml	Sat Apr 29 00:32:42 2017	(r3994)
+++ trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml	Sat Apr 29 00:44:18 2017	(r3995)
@@ -3,137 +3,515 @@
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="http://www.ivoa.net/xml/VODML/v1.0 http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/xsd/vo-dml-v1.0.xsd">
   <name>coords</name>
-  <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-  <title>STC2 Coordinates Model</title>
+  <description>The coordsys model defines a pattern for Coordinate Frame specifications, various Coordinate System objects for bundling Coordinate Frames into associated groups, and implements the CoordFrame pattern for several physical domains.  The expectation is that as models are created which touch on domains not represented here, they will implement this pattern in the same fashion for the new domain.  This implementation may reside in the other model, or be added to this list of implementations.  Models which refer to the CoordFrame of this model are stating an expectation that the instances included follow the specified pattern.
+</description>
+  <title>Astronomical Coordinates and Coordinate Systems</title>
   <author>Arnold Rots, Mark Cresitello-Dittmar</author>
   <version>2.0</version>
   <previousVersion>0.x</previousVersion>
-  <lastModified>2017-03-09T11:53:40</lastModified>
+  <lastModified>2017-04-28T11:20:22</lastModified>
   <import>
     <name>ivoa</name>
     <url>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</url>
     <documentationURL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html</documentationURL>
   </import>
-  <import>
-    <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>
-    <documentationURL>https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/STC2/prototype/coordsys/STCCoordSys-2.0.html</documentationURL>
-  </import>
+  <enumeration>
+    <vodml-id>Handedness</vodml-id>
+    <name>Handedness</name>
+    <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+    <literal>
+      <vodml-id>Handedness.left</vodml-id>
+      <name>left</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+    </literal>
+    <literal>
+      <vodml-id>Handedness.right</vodml-id>
+      <name>right</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+    </literal>
+  </enumeration>
+
+  <dataType abstract="true">
+    <vodml-id>BasicCoordValue</vodml-id>
+    <name>BasicCoordValue</name>
+    <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+  </dataType>
+
+  <dataType abstract="true">
+    <vodml-id>CoordValue</vodml-id>
+    <name>CoordValue</name>
+    <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+    <extends>
+      <vodml-ref>coords:BasicCoordValue</vodml-ref>
+    </extends>
+    <reference>
+      <vodml-id>CoordValue.coordAxis</vodml-id>
+      <name>coordAxis</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <datatype>
+        <vodml-ref>coords:Axis</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </reference>
+  </dataType>
+
+  <dataType abstract="true">
+    <vodml-id>MultiCoordValue</vodml-id>
+    <name>MultiCoordValue</name>
+    <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+    <extends>
+      <vodml-ref>coords:BasicCoordValue</vodml-ref>
+    </extends>
+    <attribute>
+      <vodml-id>MultiCoordValue.cmpt</vodml-id>
+      <name>cmpt</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <datatype>
+        <vodml-ref>coords:CoordValue</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>-1</maxOccurs>
+      </multiplicity>
+    </attribute>
+  </dataType>
+
+  <dataType abstract="true">
+    <vodml-id>PhysicalCoordValue</vodml-id>
+    <name>PhysicalCoordValue</name>
+    <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+    <extends>
+      <vodml-ref>coords:CoordValue</vodml-ref>
+    </extends>
+    <constraint>
+      <description>coordAxis:PhysicalAxis[1]</description>
+    </constraint>
+    <attribute>
+      <vodml-id>PhysicalCoordValue.cval</vodml-id>
+      <name>cval</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <datatype>
+        <vodml-ref>ivoa:Quantity</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
+  </dataType>
+
+  <dataType abstract="true">
+    <vodml-id>BinnedCoordValue</vodml-id>
+    <name>BinnedCoordValue</name>
+    <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+    <extends>
+      <vodml-ref>coords:CoordValue</vodml-ref>
+    </extends>
+    <attribute>
+      <vodml-id>BinnedCoordValue.cval</vodml-id>
+      <name>cval</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <datatype>
+        <vodml-ref>ivoa:integer</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
+  </dataType>
+
+  <dataType abstract="true">
+    <vodml-id>DiscreteCoordValue</vodml-id>
+    <name>DiscreteCoordValue</name>
+    <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+    <extends>
+      <vodml-ref>coords:CoordValue</vodml-ref>
+    </extends>
+    <constraint>
+      <description>coordAxis:DiscreteAxis</description>
+    </constraint>
+  </dataType>
+
   <objectType abstract="true">
-    <vodml-id>DerivedCoordinate</vodml-id>
-    <name>DerivedCoordinate</name>
+    <vodml-id>CoordFrame</vodml-id>
+    <name>CoordFrame</name>
     <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
+    <composition>
+      <vodml-id>CoordFrame.coordSpace</vodml-id>
+      <name>coordSpace</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <datatype>
+        <vodml-ref>coords:CoordSpace</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </composition>
   </objectType>
 
+  <objectType>
+    <vodml-id>CoordSys</vodml-id>
+    <name>CoordSys</name>
+    <description>The CoordSys object is the parent of a set of containers for organizing Coordinate Frame specifications into related groupings.  </description>
+    <reference>
+      <vodml-id>CoordSys.genericFrame</vodml-id>
+      <name>genericFrame</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <datatype>
+        <vodml-ref>coords:domain.generic.GenericFrame</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>0</minOccurs>
+        <maxOccurs>-1</maxOccurs>
+      </multiplicity>
+    </reference>
+  </objectType>
 
+  <objectType>
+    <vodml-id>AstroCoordSystem</vodml-id>
+    <name>AstroCoordSystem</name>
+    <description>AstroCoordSystem is a container object for organizing physical Coordinate Frame specifications into related groupings.  The object provides a references to Coordinate Frame instances in each of the known domain implementations.  As a whole, the AstroCoordSystem should provide a complete description of the domain space. </description>
+    <extends>
+      <vodml-ref>coords:CoordSys</vodml-ref>
+    </extends>
+    <attribute>
+      <vodml-id>AstroCoordSystem.refPosition</vodml-id>
+      <name>refPosition</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <datatype>
+        <vodml-ref>coords:domain.spatial.RefLocation</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
+    <attribute>
+      <vodml-id>AstroCoordSystem.planetaryEphem</vodml-id>
+      <name>planetaryEphem</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <datatype>
+        <vodml-ref>ivoa:string</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
+    <reference>
+      <vodml-id>AstroCoordSystem.polarizationFrame</vodml-id>
+      <name>polarizationFrame</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <datatype>
+        <vodml-ref>coords:domain.polarization.PolarizationFrame</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>0</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </reference>
+    <reference>
+      <vodml-id>AstroCoordSystem.spaceFrame</vodml-id>
+      <name>spaceFrame</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <datatype>
+        <vodml-ref>coords:domain.spatial.SpaceFrame</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>0</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </reference>
+    <reference>
+      <vodml-id>AstroCoordSystem.timeFrame</vodml-id>
+      <name>timeFrame</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <datatype>
+        <vodml-ref>coords:domain.temporal.TimeFrame</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>0</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </reference>
+    <reference>
+      <vodml-id>AstroCoordSystem.spectralFrame</vodml-id>
+      <name>spectralFrame</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <datatype>
+        <vodml-ref>coords:domain.spectral.SpectralFrame</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>0</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </reference>
+  </objectType>
 
-  <package>
-    <vodml-id>domain</vodml-id>
-    <name>domain</name>
+  <objectType>
+    <vodml-id>PixelCoordSystem</vodml-id>
+    <name>PixelCoordSystem</name>
+    <description>The PixelCoordSystem contains the complete list of Pixel Frame specifications.  Here, the relation between the system and its frames is different than in the physical CoordSys.  In the pixel domain, there is only 1 system, composed of a specific set of PixelAxes organized in PixelFrames.</description>
+    <composition>
+      <vodml-id>PixelCoordSystem.pixelFrame</vodml-id>
+      <name>pixelFrame</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <datatype>
+        <vodml-ref>coords:domain.pixel.PixelFrame</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>-1</maxOccurs>
+      </multiplicity>
+    </composition>
+  </objectType>
+
+  <objectType abstract="true">
+    <vodml-id>CoordSpace</vodml-id>
+    <name>CoordSpace</name>
     <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
+    <composition>
+      <vodml-id>CoordSpace.coordAxis</vodml-id>
+      <name>coordAxis</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <datatype>
+        <vodml-ref>coords:Axis</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>-1</maxOccurs>
+      </multiplicity>
+    </composition>
+  </objectType>
 
+  <objectType abstract="true">
+    <vodml-id>Axis</vodml-id>
+    <name>Axis</name>
+    <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+    <attribute>
+      <vodml-id>Axis.name</vodml-id>
+      <name>name</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <datatype>
+        <vodml-ref>ivoa:string</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>0</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
+  </objectType>
 
-    <package>
-      <vodml-id>domain.generic</vodml-id>
-      <name>generic</name>
+  <objectType>
+    <vodml-id>PhysicalAxis</vodml-id>
+    <name>PhysicalAxis</name>
+    <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+    <extends>
+      <vodml-ref>coords:Axis</vodml-ref>
+    </extends>
+    <attribute>
+      <vodml-id>PhysicalAxis.domainMin</vodml-id>
+      <name>domainMin</name>
       <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <objectType>
-        <vodml-id>domain.generic.Measurement</vodml-id>
-        <name>Measurement</name>
-        <description>
+      <datatype>
+        <vodml-ref>ivoa:Quantity</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>0</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
+    <attribute>
+      <vodml-id>PhysicalAxis.domainMax</vodml-id>
+      <name>domainMax</name>
+      <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:DerivedCoordinate</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.generic.Measurement.coord</vodml-id>
-          <name>coord</name>
-          <description>
+      <datatype>
+        <vodml-ref>ivoa:Quantity</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>0</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
+    <attribute>
+      <vodml-id>PhysicalAxis.cyclic</vodml-id>
+      <name>cyclic</name>
+      <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coordsys:domain.generic.GenericCoord</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-        <composition>
-          <vodml-id>domain.generic.Measurement.error</vodml-id>
-          <name>error</name>
-          <description>
+      <datatype>
+        <vodml-ref>ivoa:boolean</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>0</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
+  </objectType>
+
+  <objectType>
+    <vodml-id>DiscreteAxis</vodml-id>
+    <name>DiscreteAxis</name>
+    <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:domain.generic.Error</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>0</minOccurs>
-            <maxOccurs>-1</maxOccurs>
-          </multiplicity>
-        </composition>
-      </objectType>
+    <extends>
+      <vodml-ref>coords:Axis</vodml-ref>
+    </extends>
+  </objectType>
 
-      <objectType abstract="true">
-        <vodml-id>domain.generic.Error</vodml-id>
-        <name>Error</name>
+
+
+  <package>
+    <vodml-id>domain</vodml-id>
+    <name>domain</name>
+    <description>The Domain package contains implementations of the Coordinate Frame pattern for various physical domains.  Many of these domains are 1-Dimensional and there is a good deal of consolidation which could take place in those domains (ie 1-1 relations could get absorbed or eliminated).  However, the defined pattern satisfies ALL domains, and we feel the consistancy this generates simplifies the understanding and implementation of the model.  If one understands the pattern, the interpretation of any domain is straight-forward.</description>
+
+
+    <package>
+      <vodml-id>domain.pixel</vodml-id>
+      <name>pixel</name>
+      <description>This package implements the Coordinate Frame pattern for the Pixel domain.
+The Pixel coordinate space is defined as a 'virtual' binned space, with no physical meaning.  The axes in this space provide integer indexes into the space.</description>
+      <dataType>
+        <vodml-id>domain.pixel.PixelIndex</vodml-id>
+        <name>PixelIndex</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
+        <extends>
+          <vodml-ref>coords:BinnedCoordValue</vodml-ref>
+        </extends>
+        <constraint>
+          <description>coordAxis:PixelAxis</description>
+        </constraint>
+      </dataType>
+
+      <objectType>
+        <vodml-id>domain.pixel.PixelFrame</vodml-id>
+        <name>PixelFrame</name>
+        <description>origin: 0.0
+dimensionality: 1..3
+orientation: n/a
+</description>
+        <extends>
+          <vodml-ref>coords:CoordFrame</vodml-ref>
+        </extends>
+        <constraint>
+          <description>coordSpace:PixelSpace[1]</description>
+        </constraint>
       </objectType>
 
       <objectType>
-        <vodml-id>domain.generic.StatisticalError</vodml-id>
-        <name>StatisticalError</name>
+        <vodml-id>domain.pixel.PixelSpace</vodml-id>
+        <name>PixelSpace</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.generic.Error</vodml-ref>
+          <vodml-ref>coords:CoordSpace</vodml-ref>
         </extends>
+        <constraint>
+          <description>coordAxis:PixelAxis[1..3]</description>
+        </constraint>
         <attribute>
-          <vodml-id>domain.generic.StatisticalError.statError</vodml-id>
-          <name>statError</name>
+          <vodml-id>domain.pixel.PixelSpace.handedness</vodml-id>
+          <name>handedness</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords:Handedness</vodml-ref>
           </datatype>
           <multiplicity>
-            <minOccurs>1</minOccurs>
+            <minOccurs>0</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
       </objectType>
 
       <objectType>
-        <vodml-id>domain.generic.SystematicError</vodml-id>
-        <name>SystematicError</name>
+        <vodml-id>domain.pixel.PixelAxis</vodml-id>
+        <name>PixelAxis</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.generic.Error</vodml-ref>
+          <vodml-ref>coords:Axis</vodml-ref>
         </extends>
         <attribute>
-          <vodml-id>domain.generic.SystematicError.sysError</vodml-id>
-          <name>sysError</name>
+          <vodml-id>domain.pixel.PixelAxis.numPix</vodml-id>
+          <name>numPix</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>ivoa:nonnegativeInteger</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -142,54 +520,51 @@
         </attribute>
       </objectType>
 
+    </package>
+
+
+
+    <package>
+      <vodml-id>domain.generic</vodml-id>
+      <name>generic</name>
+      <description>Implementation of the Coordinate Frame pattern for 'generic' domains.   The generic domain covers any domain not represented by the specialized physical domains, and a specialized representation is not deemed necessary.</description>
+      <dataType>
+        <vodml-id>domain.generic.GenericCoordValue</vodml-id>
+        <name>GenericCoordValue</name>
+        <description>An instance of a point along the associated axis.
+NOTE: This represents an absolute point in the coordinate space and not a 'measured' value, which is defined in the coords model.</description>
+        <extends>
+          <vodml-ref>coords:PhysicalCoordValue</vodml-ref>
+        </extends>
+      </dataType>
+
       <objectType>
-        <vodml-id>domain.generic.RandomError</vodml-id>
-        <name>RandomError</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+        <vodml-id>domain.generic.GenericFrame</vodml-id>
+        <name>GenericFrame</name>
+        <description>origin: 0.0 
+dimensionality: 1D
+orientation: n/a
+</description>
         <extends>
-          <vodml-ref>coords:domain.generic.Error</vodml-ref>
+          <vodml-ref>coords:CoordFrame</vodml-ref>
         </extends>
-        <attribute>
-          <vodml-id>domain.generic.RandomError.randError</vodml-id>
-          <name>randError</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
+        <constraint>
+          <description>coordSpace:GenericCoordSpace[1]</description>
+        </constraint>
       </objectType>
 
       <objectType>
-        <vodml-id>domain.generic.Resolution</vodml-id>
-        <name>Resolution</name>
+        <vodml-id>domain.generic.GenericCoordSpace</vodml-id>
+        <name>GenericCoordSpace</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.generic.Error</vodml-ref>
+          <vodml-ref>coords:CoordSpace</vodml-ref>
         </extends>
-        <attribute>
-          <vodml-id>domain.generic.Resolution.res</vodml-id>
-          <name>res</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
+        <constraint>
+          <description>axis:PhysicalAxis[1]</description>
+        </constraint>
       </objectType>
 
     </package>
@@ -199,1630 +574,1340 @@
     <package>
       <vodml-id>domain.spatial</vodml-id>
       <name>spatial</name>
-      <description>
+      <description>Implementation of the Coordinate Frame pattern for the Spatial domain.
+This domain is relatively complex each property of the pattern ( origin, orientation, coordinate space ) has a non-trivial definition and the domain has a higher level of dimensionality.
+</description>
+      <enumeration>
+        <vodml-id>domain.spatial.EpochType</vodml-id>
+        <name>EpochType</name>
+        <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <objectType abstract="true">
-        <vodml-id>domain.spatial.Position</vodml-id>
-        <name>Position</name>
-        <description>
+        <literal>
+          <vodml-id>domain.spatial.EpochType.J</vodml-id>
+          <name>J</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:DerivedCoordinate</vodml-ref>
-        </extends>
-      </objectType>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.EpochType.B</vodml-id>
+          <name>B</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+      </enumeration>
 
-      <objectType>
-        <vodml-id>domain.spatial.Position1D</vodml-id>
-        <name>Position1D</name>
+      <enumeration>
+        <vodml-id>domain.spatial.StdRefPosition</vodml-id>
+        <name>StdRefPosition</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spatial.Position</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spatial.Position1D.coord</vodml-id>
-          <name>coord</name>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.TOPOCENTER</vodml-id>
+          <name>TOPOCENTER</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coordsys:domain.spatial.SpatialCoord</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-        <composition>
-          <vodml-id>domain.spatial.Position1D.error</vodml-id>
-          <name>error</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.BARYCENTER</vodml-id>
+          <name>BARYCENTER</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:domain.spatial.Error1D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>0</minOccurs>
-            <maxOccurs>-1</maxOccurs>
-          </multiplicity>
-        </composition>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spatial.Position2D</vodml-id>
-        <name>Position2D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.HELIOCENTER</vodml-id>
+          <name>HELIOCENTER</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spatial.Position</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spatial.Position2D.coord</vodml-id>
-          <name>coord</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.GEOCENTER</vodml-id>
+          <name>GEOCENTER</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coordsys:domain.spatial.SpatialCoord</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>2</minOccurs>
-            <maxOccurs>2</maxOccurs>
-          </multiplicity>
-        </attribute>
-        <composition>
-          <vodml-id>domain.spatial.Position2D.error</vodml-id>
-          <name>error</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.GALACTIC_CENTER</vodml-id>
+          <name>GALACTIC_CENTER</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:domain.spatial.Error2D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>0</minOccurs>
-            <maxOccurs>-1</maxOccurs>
-          </multiplicity>
-        </composition>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spatial.Position3D</vodml-id>
-        <name>Position3D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.LOCAL_GROUP_CENTER</vodml-id>
+          <name>LOCAL_GROUP_CENTER</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spatial.Position</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spatial.Position3D.coord</vodml-id>
-          <name>coord</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.MOON</vodml-id>
+          <name>MOON</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coordsys:domain.spatial.SpatialCoord</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>3</minOccurs>
-            <maxOccurs>3</maxOccurs>
-          </multiplicity>
-        </attribute>
-        <composition>
-          <vodml-id>domain.spatial.Position3D.error</vodml-id>
-          <name>error</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.EMBARYCENTER</vodml-id>
+          <name>EMBARYCENTER</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:domain.spatial.Error3D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>0</minOccurs>
-            <maxOccurs>-1</maxOccurs>
-          </multiplicity>
-        </composition>
-      </objectType>
-
-      <objectType abstract="true">
-        <vodml-id>domain.spatial.Error1D</vodml-id>
-        <name>Error1D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.MERCURY</vodml-id>
+          <name>MERCURY</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spatial.StatisticalError1D</vodml-id>
-        <name>StatisticalError1D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.VENUS</vodml-id>
+          <name>VENUS</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spatial.Error1D</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spatial.StatisticalError1D.statError</vodml-id>
-          <name>statError</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.MARS</vodml-id>
+          <name>MARS</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spatial.SystematicError1D</vodml-id>
-        <name>SystematicError1D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.JUPITER</vodml-id>
+          <name>JUPITER</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spatial.Error1D</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spatial.SystematicError1D.sysError</vodml-id>
-          <name>sysError</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.SATURN</vodml-id>
+          <name>SATURN</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spatial.RandomError1D</vodml-id>
-        <name>RandomError1D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.URANUS</vodml-id>
+          <name>URANUS</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spatial.Error1D</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spatial.RandomError1D.randError</vodml-id>
-          <name>randError</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.NEPTUNE</vodml-id>
+          <name>NEPTUNE</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spatial.Resolution1D</vodml-id>
-        <name>Resolution1D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.PLUTO</vodml-id>
+          <name>PLUTO</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spatial.Error1D</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spatial.Resolution1D.res</vodml-id>
-          <name>res</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.RELOCATABLE</vodml-id>
+          <name>RELOCATABLE</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </objectType>
-
-      <objectType abstract="true">
-        <vodml-id>domain.spatial.Error2D</vodml-id>
-        <name>Error2D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.LSR</vodml-id>
+          <name>LSR</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spatial.StatisticalError2D</vodml-id>
-        <name>StatisticalError2D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.LSRK</vodml-id>
+          <name>LSRK</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spatial.Error2D</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spatial.StatisticalError2D.statError</vodml-id>
-          <name>statError</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.LSRD</vodml-id>
+          <name>LSRD</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spatial.SystematicError2D</vodml-id>
-        <name>SystematicError2D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.UNKNOWN</vodml-id>
+          <name>UNKNOWN</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spatial.Error2D</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spatial.SystematicError2D.sysError</vodml-id>
-          <name>sysError</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefPosition.CUSTOM</vodml-id>
+          <name>CUSTOM</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </objectType>
+        </literal>
+      </enumeration>
 
-      <objectType>
-        <vodml-id>domain.spatial.RandomError2D</vodml-id>
-        <name>RandomError2D</name>
+      <enumeration>
+        <vodml-id>domain.spatial.StdRefFrame</vodml-id>
+        <name>StdRefFrame</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spatial.Error2D</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spatial.RandomError2D.randError</vodml-id>
-          <name>randError</name>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.ICRS</vodml-id>
+          <name>ICRS</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.FK4</vodml-id>
+          <name>FK4</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.FK5</vodml-id>
+          <name>FK5</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.ECLIPTIC</vodml-id>
+          <name>ECLIPTIC</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.GALACTIC_I</vodml-id>
+          <name>GALACTIC_I</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.GALACTIC_II</vodml-id>
+          <name>GALACTIC_II</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.SUPER_GALACTIC</vodml-id>
+          <name>SUPER_GALACTIC</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.AZ_EL</vodml-id>
+          <name>AZ_EL</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.BODY</vodml-id>
+          <name>BODY</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.GEO_C</vodml-id>
+          <name>GEO_C</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.GEO_D</vodml-id>
+          <name>GEO_D</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.MAG</vodml-id>
+          <name>MAG</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.GSE</vodml-id>
+          <name>GSE</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.GSM</vodml-id>
+          <name>GSM</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.SM</vodml-id>
+          <name>SM</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.HGC</vodml-id>
+          <name>HGC</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.HEE</vodml-id>
+          <name>HEE</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.HEEQ</vodml-id>
+          <name>HEEQ</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.HCI</vodml-id>
+          <name>HCI</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spatial.Resolution2D</vodml-id>
-        <name>Resolution2D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.HCD</vodml-id>
+          <name>HCD</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spatial.Error2D</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spatial.Resolution2D.res</vodml-id>
-          <name>res</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.MERCURY_C</vodml-id>
+          <name>MERCURY_C</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </objectType>
-
-      <objectType abstract="true">
-        <vodml-id>domain.spatial.Error3D</vodml-id>
-        <name>Error3D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.VENUS_C</vodml-id>
+          <name>VENUS_C</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spatial.StatisticalError3D</vodml-id>
-        <name>StatisticalError3D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.LUNA_C</vodml-id>
+          <name>LUNA_C</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spatial.Error3D</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spatial.StatisticalError3D.statError</vodml-id>
-          <name>statError</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.MARS_C</vodml-id>
+          <name>MARS_C</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spatial.SystematicError3D</vodml-id>
-        <name>SystematicError3D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.JUPITER_C_III</vodml-id>
+          <name>JUPITER_C_III</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spatial.Error3D</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spatial.SystematicError3D.sysError</vodml-id>
-          <name>sysError</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.SATURN_C_III</vodml-id>
+          <name>SATURN_C_III</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spatial.RandomError3D</vodml-id>
-        <name>RandomError3D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.URANUS_C_III</vodml-id>
+          <name>URANUS_C_III</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spatial.Error3D</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spatial.RandomError3D.randError</vodml-id>
-          <name>randError</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.NEPTUNE_C_III</vodml-id>
+          <name>NEPTUNE_C_III</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spatial.Resolution3D</vodml-id>
-        <name>Resolution3D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.PLUTO_C</vodml-id>
+          <name>PLUTO_C</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spatial.Error3D</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spatial.Resolution3D.res</vodml-id>
-          <name>res</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.MERCURY_G</vodml-id>
+          <name>MERCURY_G</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </objectType>
-
-    </package>
-
-
-
-    <package>
-      <vodml-id>domain.spectral</vodml-id>
-      <name>spectral</name>
-      <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.VENUS_G</vodml-id>
+          <name>VENUS_G</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <objectType abstract="true">
-        <vodml-id>domain.spectral.DerivedSpectralCoordinate</vodml-id>
-        <name>DerivedSpectralCoordinate</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.LUNA_G</vodml-id>
+          <name>LUNA_G</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:DerivedCoordinate</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spectral.DerivedSpectralCoordinate.coord</vodml-id>
-          <name>coord</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.MARS_G</vodml-id>
+          <name>MARS_G</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coordsys:domain.spectral.SpectralCoord</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-        <composition>
-          <vodml-id>domain.spectral.DerivedSpectralCoordinate.error</vodml-id>
-          <name>error</name>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.JUPITER_G_III</vodml-id>
+          <name>JUPITER_G_III</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:domain.spectral.Error</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>0</minOccurs>
-            <maxOccurs>-1</maxOccurs>
-          </multiplicity>
-        </composition>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spectral.Energy</vodml-id>
-        <name>Energy</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.SATURN_G_III</vodml-id>
+          <name>SATURN_G_III</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spectral.DerivedSpectralCoordinate</vodml-ref>
-        </extends>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spectral.Frequency</vodml-id>
-        <name>Frequency</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.URANUS_G_III</vodml-id>
+          <name>URANUS_G_III</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spectral.DerivedSpectralCoordinate</vodml-ref>
-        </extends>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spectral.Wavelength</vodml-id>
-        <name>Wavelength</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.NEPTUNE_G_III</vodml-id>
+          <name>NEPTUNE_G_III</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spectral.DerivedSpectralCoordinate</vodml-ref>
-        </extends>
-      </objectType>
-
-      <objectType abstract="true">
-        <vodml-id>domain.spectral.Error</vodml-id>
-        <name>Error</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.PLUTO_G</vodml-id>
+          <name>PLUTO_G</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      </objectType>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.UNKNOWN</vodml-id>
+          <name>UNKNOWN</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.StdRefFrame.CUSTOM</vodml-id>
+          <name>CUSTOM</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+      </enumeration>
 
-      <objectType>
-        <vodml-id>domain.spectral.StatisticalError</vodml-id>
-        <name>StatisticalError</name>
+      <dataType>
+        <vodml-id>domain.spatial.Epoch</vodml-id>
+        <name>Epoch</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>coords:domain.spectral.Error</vodml-ref>
-        </extends>
         <attribute>
-          <vodml-id>domain.spectral.StatisticalError.statError</vodml-id>
-          <name>statError</name>
+          <vodml-id>domain.spatial.Epoch.type</vodml-id>
+          <name>type</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords:domain.spatial.EpochType</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spectral.SystematicError</vodml-id>
-        <name>SystematicError</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>coords:domain.spectral.Error</vodml-ref>
-        </extends>
         <attribute>
-          <vodml-id>domain.spectral.SystematicError.sysError</vodml-id>
-          <name>sysError</name>
+          <vodml-id>domain.spatial.Epoch.year</vodml-id>
+          <name>year</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>ivoa:real</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
-      </objectType>
+      </dataType>
 
-      <objectType>
-        <vodml-id>domain.spectral.RandomError</vodml-id>
-        <name>RandomError</name>
+      <dataType>
+        <vodml-id>domain.spatial.SpatialCoordValue</vodml-id>
+        <name>SpatialCoordValue</name>
+        <description>An instance of a point along the associated axis.
+NOTE: This represents an absolute point in the coordinate space and not a 'measured' value, which is defined in the coords model.</description>
+        <extends>
+          <vodml-ref>coords:PhysicalCoordValue</vodml-ref>
+        </extends>
+        <constraint>
+          <description>cval:RealQuantity</description>
+        </constraint>
+      </dataType>
+
+      <dataType abstract="true">
+        <vodml-id>domain.spatial.RefLocation</vodml-id>
+        <name>RefLocation</name>
+        <description>RefLocation defines the origin of the spatial coordinate space.  This location is represented either by a standard reference position, or a specified point in another Spatial frame.  This object is used as the origin of the SpaceFrame here, but also to specify the Spatial Reference Position (refPosition) associated with other domain Frames.  For example, in the Time domain, the Spatial Reference Position indicates that the 'time' values are the time that the 'event' occured at that location, which may be different from the detector location.  
+ </description>
+      </dataType>
+
+      <dataType>
+        <vodml-id>domain.spatial.StdRefLocation</vodml-id>
+        <name>StdRefLocation</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spectral.Error</vodml-ref>
+          <vodml-ref>coords:domain.spatial.RefLocation</vodml-ref>
         </extends>
         <attribute>
-          <vodml-id>domain.spectral.RandomError.randError</vodml-id>
-          <name>randError</name>
+          <vodml-id>domain.spatial.StdRefLocation.position</vodml-id>
+          <name>position</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords:domain.spatial.StdRefPosition</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
-      </objectType>
+      </dataType>
 
-      <objectType>
-        <vodml-id>domain.spectral.Resolution</vodml-id>
-        <name>Resolution</name>
+      <dataType>
+        <vodml-id>domain.spatial.CustomRefLocation</vodml-id>
+        <name>CustomRefLocation</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.spectral.Error</vodml-ref>
+          <vodml-ref>coords:domain.spatial.RefLocation</vodml-ref>
         </extends>
         <attribute>
-          <vodml-id>domain.spectral.Resolution.res</vodml-id>
-          <name>res</name>
+          <vodml-id>domain.spatial.CustomRefLocation.epoch</vodml-id>
+          <name>epoch</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords:domain.spatial.Epoch</vodml-ref>
           </datatype>
           <multiplicity>
-            <minOccurs>1</minOccurs>
+            <minOccurs>0</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
-      </objectType>
-
-    </package>
-
-
-
-    <package>
-      <vodml-id>domain.temporal</vodml-id>
-      <name>temporal</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-      <objectType>
-        <vodml-id>domain.temporal.Time</vodml-id>
-        <name>Time</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>coords:DerivedCoordinate</vodml-ref>
-        </extends>
         <attribute>
-          <vodml-id>domain.temporal.Time.coord</vodml-id>
-          <name>coord</name>
+          <vodml-id>domain.spatial.CustomRefLocation.position</vodml-id>
+          <name>position</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.temporal.TimeCoord</vodml-ref>
+            <vodml-ref>coords:domain.spatial.SpatialCoord</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
-        <composition>
-          <vodml-id>domain.temporal.Time.error</vodml-id>
-          <name>error</name>
+        <attribute>
+          <vodml-id>domain.spatial.CustomRefLocation.velocity</vodml-id>
+          <name>velocity</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:domain.temporal.Error</vodml-ref>
+            <vodml-ref>coords:domain.spatial.SpatialCoord</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
-            <maxOccurs>-1</maxOccurs>
+            <maxOccurs>1</maxOccurs>
           </multiplicity>
-        </composition>
-      </objectType>
+        </attribute>
+      </dataType>
 
-      <objectType abstract="true">
-        <vodml-id>domain.temporal.Error</vodml-id>
-        <name>Error</name>
+      <dataType abstract="true">
+        <vodml-id>domain.spatial.SpatialCoord</vodml-id>
+        <name>SpatialCoord</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      </objectType>
+        <extends>
+          <vodml-ref>coords:MultiCoordValue</vodml-ref>
+        </extends>
+      </dataType>
 
-      <objectType>
-        <vodml-id>domain.temporal.StatisticalError</vodml-id>
-        <name>StatisticalError</name>
+      <dataType>
+        <vodml-id>domain.spatial.SpatialCoord1D</vodml-id>
+        <name>SpatialCoord1D</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.temporal.Error</vodml-ref>
+          <vodml-ref>coords:domain.spatial.SpatialCoord</vodml-ref>
         </extends>
-        <attribute>
-          <vodml-id>domain.temporal.StatisticalError.statError</vodml-id>
-          <name>statError</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </objectType>
+        <constraint>
+          <description>cmpt:SpatialCoordValue[1]</description>
+        </constraint>
+      </dataType>
 
-      <objectType>
-        <vodml-id>domain.temporal.SystematicError</vodml-id>
-        <name>SystematicError</name>
+      <dataType>
+        <vodml-id>domain.spatial.SpatialCoord2D</vodml-id>
+        <name>SpatialCoord2D</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.temporal.Error</vodml-ref>
+          <vodml-ref>coords:domain.spatial.SpatialCoord</vodml-ref>
         </extends>
-        <attribute>
-          <vodml-id>domain.temporal.SystematicError.sysError</vodml-id>
-          <name>sysError</name>
-          <description>
+        <constraint>
+          <description>cmpt:SpatialCoordValue[2]</description>
+        </constraint>
+      </dataType>
+
+      <dataType>
+        <vodml-id>domain.spatial.SpatialCoord3D</vodml-id>
+        <name>SpatialCoord3D</name>
+        <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </objectType>
+        <extends>
+          <vodml-ref>coords:domain.spatial.SpatialCoord</vodml-ref>
+        </extends>
+        <constraint>
+          <description>cmpt:SpatialCoordValue[3]</description>
+        </constraint>
+      </dataType>
 
       <objectType>
-        <vodml-id>domain.temporal.RandomError</vodml-id>
-        <name>RandomError</name>
+        <vodml-id>domain.spatial.SpaceFrame</vodml-id>
+        <name>SpaceFrame</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.temporal.Error</vodml-ref>
+          <vodml-ref>coords:CoordFrame</vodml-ref>
         </extends>
+        <constraint>
+          <description>coordSpace:SpatialSpace[1]</description>
+        </constraint>
         <attribute>
-          <vodml-id>domain.temporal.RandomError.randError</vodml-id>
-          <name>randError</name>
+          <vodml-id>domain.spatial.SpaceFrame.spaceRefFrame</vodml-id>
+          <name>spaceRefFrame</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords:domain.spatial.StdRefFrame</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.temporal.Resolution</vodml-id>
-        <name>Resolution</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>coords:domain.temporal.Error</vodml-ref>
-        </extends>
         <attribute>
-          <vodml-id>domain.temporal.Resolution.res</vodml-id>
-          <name>res</name>
+          <vodml-id>domain.spatial.SpaceFrame.equinox</vodml-id>
+          <name>equinox</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
+            <vodml-ref>coords:domain.spatial.Epoch</vodml-ref>
           </datatype>
           <multiplicity>
-            <minOccurs>1</minOccurs>
+            <minOccurs>0</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
-      </objectType>
-
-    </package>
-
-
-
-    <package>
-      <vodml-id>domain.polarization</vodml-id>
-      <name>polarization</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      </objectType>
+
       <objectType abstract="true">
-        <vodml-id>domain.polarization.DerivedPolarizationCoordinate</vodml-id>
-        <name>DerivedPolarizationCoordinate</name>
+        <vodml-id>domain.spatial.SpatialSpace</vodml-id>
+        <name>SpatialSpace</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:DerivedCoordinate</vodml-ref>
+          <vodml-ref>coords:CoordSpace</vodml-ref>
         </extends>
       </objectType>
 
       <objectType>
-        <vodml-id>domain.polarization.Stokes</vodml-id>
-        <name>Stokes</name>
+        <vodml-id>domain.spatial.Spherical</vodml-id>
+        <name>Spherical</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.polarization.DerivedPolarizationCoordinate</vodml-ref>
+          <vodml-ref>coords:domain.spatial.SpatialSpace</vodml-ref>
         </extends>
+        <constraint>
+          <description>coordAxis:PhysicalAxis[1..3]</description>
+        </constraint>
         <attribute>
-          <vodml-id>domain.polarization.Stokes.coord</vodml-id>
-          <name>coord</name>
+          <vodml-id>domain.spatial.Spherical.handedness</vodml-id>
+          <name>handedness</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.polarization.PolStokesCoord</vodml-ref>
+            <vodml-ref>coords:Handedness</vodml-ref>
           </datatype>
           <multiplicity>
-            <minOccurs>1</minOccurs>
+            <minOccurs>0</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
       </objectType>
 
       <objectType>
-        <vodml-id>domain.polarization.Circular</vodml-id>
-        <name>Circular</name>
+        <vodml-id>domain.spatial.Cartesian</vodml-id>
+        <name>Cartesian</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.polarization.DerivedPolarizationCoordinate</vodml-ref>
+          <vodml-ref>coords:domain.spatial.SpatialSpace</vodml-ref>
         </extends>
+        <constraint>
+          <description>coordAxis:PhysicalAxis[1..3]</description>
+        </constraint>
         <attribute>
-          <vodml-id>domain.polarization.Circular.coord</vodml-id>
-          <name>coord</name>
+          <vodml-id>domain.spatial.Cartesian.handedness</vodml-id>
+          <name>handedness</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>coordsys:domain.polarization.PolCircularCoord</vodml-ref>
+            <vodml-ref>coords:Handedness</vodml-ref>
           </datatype>
           <multiplicity>
-            <minOccurs>1</minOccurs>
+            <minOccurs>0</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
       </objectType>
 
-      <objectType>
-        <vodml-id>domain.polarization.Linear</vodml-id>
-        <name>Linear</name>
+    </package>
+
+
+
+    <package>
+      <vodml-id>domain.spectral</vodml-id>
+      <name>spectral</name>
+      <description>Implementation of the Coordinate Frame pattern for the Spectral domain.
+This is a basic 1-Dimensional coordinate space.</description>
+      <primitiveType>
+        <vodml-id>domain.spectral.Wavelength</vodml-id>
+        <name>Wavelength</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.polarization.DerivedPolarizationCoordinate</vodml-ref>
+          <vodml-ref>coords:domain.spectral.SpectralValue</vodml-ref>
         </extends>
-        <attribute>
-          <vodml-id>domain.polarization.Linear.coord</vodml-id>
-          <name>coord</name>
-          <description>
+      </primitiveType>
+
+      <primitiveType>
+        <vodml-id>domain.spectral.Frequency</vodml-id>
+        <name>Frequency</name>
+        <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coordsys:domain.polarization.PolLinearCoord</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </objectType>
+        <extends>
+          <vodml-ref>coords:domain.spectral.SpectralValue</vodml-ref>
+        </extends>
+      </primitiveType>
 
-      <objectType>
-        <vodml-id>domain.polarization.Vector</vodml-id>
-        <name>Vector</name>
+      <primitiveType>
+        <vodml-id>domain.spectral.Energy</vodml-id>
+        <name>Energy</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>coords:domain.polarization.DerivedPolarizationCoordinate</vodml-ref>
+          <vodml-ref>coords:domain.spectral.SpectralValue</vodml-ref>
         </extends>
-        <attribute>
-          <vodml-id>domain.polarization.Vector.coord</vodml-id>
-          <name>coord</name>
-          <description>
+      </primitiveType>
+
+      <dataType abstract="true">
+        <vodml-id>domain.spectral.SpectralValue</vodml-id>
+        <name>SpectralValue</name>
+        <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-          <datatype>
-            <vodml-ref>coordsys:domain.polarization.PolVectorCoord</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
+        <extends>
+          <vodml-ref>coords:PhysicalCoordValue</vodml-ref>
+        </extends>
+        <constraint>
+          <description>cval:RealQuantity</description>
+        </constraint>
+      </dataType>
+
+      <objectType>
+        <vodml-id>domain.spectral.SpectralFrame</vodml-id>
+        <name>SpectralFrame</name>
+        <description>origin: 0.0
+dimensionality: 1D
+orientation: n/a
+</description>
+        <extends>
+          <vodml-ref>coords:CoordFrame</vodml-ref>
+        </extends>
+        <constraint>
+          <description>coordSpace:SpectralSpace[1]</description>
+        </constraint>
       </objectType>
 
-    </package>
+      <objectType>
+        <vodml-id>domain.spectral.SpectralSpace</vodml-id>
+        <name>SpectralSpace</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>coords:CoordSpace</vodml-ref>
+        </extends>
+        <constraint>
+          <description>coordAxis:PhysicalAxis[1]</description>
+        </constraint>
+      </objectType>
 
-  </package>
+    </package>
 
 
 
-  <package>
-    <vodml-id>dtypes</vodml-id>
-    <name>dtypes</name>
-    <description>
+    <package>
+      <vodml-id>domain.temporal</vodml-id>
+      <name>temporal</name>
+      <description>Implementation of the Coordinate Frame pattern for the Time domain.
+This is a basic 1-Dimensional coordinate space.</description>
+      <enumeration>
+        <vodml-id>domain.temporal.TimeScale</vodml-id>
+        <name>TimeScale</name>
+        <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-    <dataType abstract="true">
-      <vodml-id>dtypes.Uncertainty</vodml-id>
-      <name>Uncertainty</name>
-      <description>
+        <literal>
+          <vodml-id>domain.temporal.TimeScale.TT</vodml-id>
+          <name>TT</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-    </dataType>
-
-    <dataType abstract="true">
-      <vodml-id>dtypes.Uncertainty1D</vodml-id>
-      <name>Uncertainty1D</name>
-      <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.temporal.TimeScale.ET</vodml-id>
+          <name>ET</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Uncertainty</vodml-ref>
-      </extends>
-    </dataType>
-
-    <dataType abstract="true">
-      <vodml-id>dtypes.Uncertainty2D</vodml-id>
-      <name>Uncertainty2D</name>
-      <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.temporal.TimeScale.TDB</vodml-id>
+          <name>TDB</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Uncertainty</vodml-ref>
-      </extends>
-    </dataType>
-
-    <dataType abstract="true">
-      <vodml-id>dtypes.Uncertainty3D</vodml-id>
-      <name>Uncertainty3D</name>
-      <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.temporal.TimeScale.TCG</vodml-id>
+          <name>TCG</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Uncertainty</vodml-ref>
-      </extends>
-    </dataType>
-
-    <dataType>
-      <vodml-id>dtypes.Symmetrical1D</vodml-id>
-      <name>Symmetrical1D</name>
-      <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.temporal.TimeScale.TCB</vodml-id>
+          <name>TCB</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dtypes.Symmetrical1D.radius</vodml-id>
-        <name>radius</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.temporal.TimeScale.TAI</vodml-id>
+          <name>TAI</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </dataType>
-
-    <dataType>
-      <vodml-id>dtypes.Asymmetrical1D</vodml-id>
-      <name>Asymmetrical1D</name>
-      <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.temporal.TimeScale.UTC</vodml-id>
+          <name>UTC</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dtypes.Asymmetrical1D.plus</vodml-id>
-        <name>plus</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.temporal.TimeScale.LST</vodml-id>
+          <name>LST</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Asymmetrical1D.minus</vodml-id>
-        <name>minus</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.temporal.TimeScale.LOCAL</vodml-id>
+          <name>LOCAL</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </dataType>
-
-    <dataType>
-      <vodml-id>dtypes.Bounds1D</vodml-id>
-      <name>Bounds1D</name>
-      <description>
+        </literal>
+      </enumeration>
+
+      <dataType abstract="true">
+        <vodml-id>domain.temporal.TimeStamp</vodml-id>
+        <name>TimeStamp</name>
+        <description>An instance of a point along the associated axis.
+NOTE: This represents an absolute point in the coordinate space and not a 'measured' value, which is defined in the coords model.</description>
+        <extends>
+          <vodml-ref>coords:PhysicalCoordValue</vodml-ref>
+        </extends>
+      </dataType>
+
+      <dataType>
+        <vodml-id>domain.temporal.TimeOffset</vodml-id>
+        <name>TimeOffset</name>
+        <description>The time coordinate is represented as an offset from the origin.</description>
+        <extends>
+          <vodml-ref>coords:domain.temporal.TimeStamp</vodml-ref>
+        </extends>
+        <constraint>
+          <description>cval:RealQuantity</description>
+        </constraint>
+      </dataType>
+
+      <dataType>
+        <vodml-id>domain.temporal.ISOTime</vodml-id>
+        <name>ISOTime</name>
+        <description>The time is represented as a particular instant.  While interchangable with the TimeOffset, this form typically has a defined structure in representation.</description>
+        <extends>
+          <vodml-ref>coords:domain.temporal.TimeStamp</vodml-ref>
+        </extends>
+        <constraint>
+          <description>cval:DateTimeQuantity</description>
+        </constraint>
+      </dataType>
+
+      <objectType>
+        <vodml-id>domain.temporal.TimeFrame</vodml-id>
+        <name>TimeFrame</name>
+        <description>origin: implied
+dimensionality: 1D
+orientation: n/a
+</description>
+        <extends>
+          <vodml-ref>coords:CoordFrame</vodml-ref>
+        </extends>
+        <constraint>
+          <description>coordSpace:TimeSpace[1]</description>
+        </constraint>
+        <attribute>
+          <vodml-id>domain.temporal.TimeFrame.timescale</vodml-id>
+          <name>timescale</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Uncertainty1D</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dtypes.Bounds1D.loLimit</vodml-id>
-        <name>loLimit</name>
-        <description>
+          <datatype>
+            <vodml-ref>coords:domain.temporal.TimeScale</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+        <attribute>
+          <vodml-id>domain.temporal.TimeFrame.refDirection</vodml-id>
+          <name>refDirection</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Bounds1D.hiLimit</vodml-id>
-        <name>hiLimit</name>
-        <description>
+          <datatype>
+            <vodml-ref>coords:domain.spatial.RefLocation</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>0</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+        <attribute>
+          <vodml-id>domain.temporal.TimeFrame.time0</vodml-id>
+          <name>time0</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </dataType>
-
-    <dataType>
-      <vodml-id>dtypes.Symmetrical2D</vodml-id>
-      <name>Symmetrical2D</name>
-      <description>
+          <datatype>
+            <vodml-ref>coords:domain.temporal.TimeStamp</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>0</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+      </objectType>
+
+      <objectType>
+        <vodml-id>domain.temporal.TimeSpace</vodml-id>
+        <name>TimeSpace</name>
+        <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dtypes.Symmetrical2D.radius</vodml-id>
-        <name>radius</name>
+        <extends>
+          <vodml-ref>coords:CoordSpace</vodml-ref>
+        </extends>
+        <constraint>
+          <description>coordAxis:PhysicalAxis[1]</description>
+        </constraint>
+      </objectType>
+
+    </package>
+
+
+
+    <package>
+      <vodml-id>domain.polarization</vodml-id>
+      <name>polarization</name>
+      <description>Implementation of the Coordinate Frame pattern for the Polarization domain.
+This is a 1-Dimensional coordinate space, but the nature of the polarization coordinate values (discrete enumerated strings) requires a different axis specification.</description>
+      <enumeration>
+        <vodml-id>domain.polarization.PolStokesEnum</vodml-id>
+        <name>PolStokesEnum</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </dataType>
-
-    <dataType>
-      <vodml-id>dtypes.Asymmetrical2D</vodml-id>
-      <name>Asymmetrical2D</name>
-      <description>
+        <literal>
+          <vodml-id>domain.polarization.PolStokesEnum.I</vodml-id>
+          <name>I</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dtypes.Asymmetrical2D.plus</vodml-id>
-        <name>plus</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.polarization.PolStokesEnum.Q</vodml-id>
+          <name>Q</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>2</minOccurs>
-          <maxOccurs>2</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Asymmetrical2D.minus</vodml-id>
-        <name>minus</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.polarization.PolStokesEnum.U</vodml-id>
+          <name>U</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>2</minOccurs>
-          <maxOccurs>2</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </dataType>
-
-    <dataType>
-      <vodml-id>dtypes.Bounds2D</vodml-id>
-      <name>Bounds2D</name>
-      <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.polarization.PolStokesEnum.V</vodml-id>
+          <name>V</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dtypes.Bounds2D.loLimit</vodml-id>
-        <name>loLimit</name>
+        </literal>
+      </enumeration>
+
+      <enumeration>
+        <vodml-id>domain.polarization.PolCircularEnum</vodml-id>
+        <name>PolCircularEnum</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>2</minOccurs>
-          <maxOccurs>2</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Bounds2D.hiLimit</vodml-id>
-        <name>hiLimit</name>
-        <description>
+        <literal>
+          <vodml-id>domain.polarization.PolCircularEnum.RR</vodml-id>
+          <name>RR</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>2</minOccurs>
-          <maxOccurs>2</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </dataType>
-
-    <dataType>
-      <vodml-id>dtypes.Symmetrical3D</vodml-id>
-      <name>Symmetrical3D</name>
-      <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.polarization.PolCircularEnum.LL</vodml-id>
+          <name>LL</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dtypes.Symmetrical3D.radius</vodml-id>
-        <name>radius</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.polarization.PolCircularEnum.RL</vodml-id>
+          <name>RL</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </dataType>
-
-    <dataType>
-      <vodml-id>dtypes.Asymmetrical3D</vodml-id>
-      <name>Asymmetrical3D</name>
-      <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.polarization.PolCircularEnum.LR</vodml-id>
+          <name>LR</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dtypes.Asymmetrical3D.plus</vodml-id>
-        <name>plus</name>
+        </literal>
+      </enumeration>
+
+      <enumeration>
+        <vodml-id>domain.polarization.PolLinearEnum</vodml-id>
+        <name>PolLinearEnum</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>3</minOccurs>
-          <maxOccurs>3</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Asymmetrical3D.minus</vodml-id>
-        <name>minus</name>
-        <description>
+        <literal>
+          <vodml-id>domain.polarization.PolLinearEnum.XX</vodml-id>
+          <name>XX</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>3</minOccurs>
-          <maxOccurs>3</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </dataType>
-
-    <dataType>
-      <vodml-id>dtypes.Bounds3D</vodml-id>
-      <name>Bounds3D</name>
-      <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.polarization.PolLinearEnum.YY</vodml-id>
+          <name>YY</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dtypes.Bounds3D.loLimit</vodml-id>
-        <name>loLimit</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.polarization.PolLinearEnum.XY</vodml-id>
+          <name>XY</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        </literal>
+        <literal>
+          <vodml-id>domain.polarization.PolLinearEnum.YX</vodml-id>
+          <name>YX</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>2</minOccurs>
-          <maxOccurs>2</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Bounds3D.hiLimit</vodml-id>
-        <name>hiLimit</name>
+        </literal>
+      </enumeration>
+
+      <enumeration>
+        <vodml-id>domain.polarization.PolVectorEnum</vodml-id>
+        <name>PolVectorEnum</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>2</minOccurs>
-          <maxOccurs>2</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </dataType>
-
-    <dataType>
-      <vodml-id>dtypes.Ellipse</vodml-id>
-      <name>Ellipse</name>
-      <description>
+        <literal>
+          <vodml-id>domain.polarization.PolVectorEnum.I</vodml-id>
+          <name>I</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dtypes.Ellipse.semiAxis</vodml-id>
-        <name>semiAxis</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.polarization.PolVectorEnum.PF</vodml-id>
+          <name>PF</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>2</minOccurs>
-          <maxOccurs>2</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Ellipse.posAngle</vodml-id>
-        <name>posAngle</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.polarization.PolVectorEnum.PP</vodml-id>
+          <name>PP</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </dataType>
-
-    <dataType>
-      <vodml-id>dtypes.Ellipsoid</vodml-id>
-      <name>Ellipsoid</name>
-      <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.polarization.PolVectorEnum.PA</vodml-id>
+          <name>PA</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dtypes.Ellipsoid.semiAxis</vodml-id>
-        <name>semiAxis</name>
+        </literal>
+      </enumeration>
+
+      <dataType abstract="true">
+        <vodml-id>domain.polarization.PolCoordValue</vodml-id>
+        <name>PolCoordValue</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>3</minOccurs>
-          <maxOccurs>3</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Ellipsoid.posAngle</vodml-id>
-        <name>posAngle</name>
+        <extends>
+          <vodml-ref>coords:DiscreteCoordValue</vodml-ref>
+        </extends>
+      </dataType>
+
+      <dataType>
+        <vodml-id>domain.polarization.PolStokes</vodml-id>
+        <name>PolStokes</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>ivoa:RealQuantity</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>2</minOccurs>
-          <maxOccurs>2</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </dataType>
-
-    <dataType abstract="true">
-      <vodml-id>dtypes.Matrix</vodml-id>
-      <name>Matrix</name>
-      <description>
+        <extends>
+          <vodml-ref>coords:domain.polarization.PolCoordValue</vodml-ref>
+        </extends>
+        <attribute>
+          <vodml-id>domain.polarization.PolStokes.cval</vodml-id>
+          <name>cval</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-    </dataType>
+          <datatype>
+            <vodml-ref>coords:domain.polarization.PolStokesEnum</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+      </dataType>
 
-    <dataType>
-      <vodml-id>dtypes.Matrix2x2</vodml-id>
-      <name>Matrix2x2</name>
-      <description>
+      <dataType>
+        <vodml-id>domain.polarization.PolCircular</vodml-id>
+        <name>PolCircular</name>
+        <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Matrix</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dtypes.Matrix2x2.m11</vodml-id>
-        <name>m11</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>ivoa:real</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Matrix2x2.m12</vodml-id>
-        <name>m12</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>ivoa:real</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Matrix2x2.m21</vodml-id>
-        <name>m21</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>ivoa:real</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Matrix2x2.m22</vodml-id>
-        <name>m22</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>ivoa:real</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </dataType>
-
-    <dataType>
-      <vodml-id>dtypes.Matrix3x3</vodml-id>
-      <name>Matrix3x3</name>
-      <description>
+        <extends>
+          <vodml-ref>coords:domain.polarization.PolCoordValue</vodml-ref>
+        </extends>
+        <attribute>
+          <vodml-id>domain.polarization.PolCircular.cval</vodml-id>
+          <name>cval</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Matrix</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dtypes.Matrix3x3.m11</vodml-id>
-        <name>m11</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>ivoa:real</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Matrix3x3.m12</vodml-id>
-        <name>m12</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>ivoa:real</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Matrix3x3.m13</vodml-id>
-        <name>m13</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>ivoa:real</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Matrix3x3.m21</vodml-id>
-        <name>m21</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>ivoa:real</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Matrix3x3.m22</vodml-id>
-        <name>m22</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>ivoa:real</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Matrix3x3.m23</vodml-id>
-        <name>m23</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>ivoa:real</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Matrix3x3.m31</vodml-id>
-        <name>m31</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>ivoa:real</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Matrix3x3.m32</vodml-id>
-        <name>m32</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>ivoa:real</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-      <attribute>
-        <vodml-id>dtypes.Matrix3x3.m33</vodml-id>
-        <name>m33</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <datatype>
-          <vodml-ref>ivoa:real</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </dataType>
-
-    <dataType>
-      <vodml-id>dtypes.CovarianceMatrix2D</vodml-id>
-      <name>CovarianceMatrix2D</name>
-      <description>
+          <datatype>
+            <vodml-ref>coords:domain.polarization.PolCircularEnum</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+      </dataType>
+
+      <dataType>
+        <vodml-id>domain.polarization.PolLinear</vodml-id>
+        <name>PolLinear</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>coords:domain.polarization.PolCoordValue</vodml-ref>
+        </extends>
+        <attribute>
+          <vodml-id>domain.polarization.PolLinear.cval</vodml-id>
+          <name>cval</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Uncertainty2D</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dtypes.CovarianceMatrix2D.matrix</vodml-id>
-        <name>matrix</name>
+          <datatype>
+            <vodml-ref>coords:domain.polarization.PolLinearEnum</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+      </dataType>
+
+      <dataType>
+        <vodml-id>domain.polarization.PolVector</vodml-id>
+        <name>PolVector</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>coords:dtypes.Matrix2x2</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </dataType>
-
-    <dataType>
-      <vodml-id>dtypes.CovarianceMatrix3D</vodml-id>
-      <name>CovarianceMatrix3D</name>
-      <description>
+        <extends>
+          <vodml-ref>coords:domain.polarization.PolCoordValue</vodml-ref>
+        </extends>
+        <attribute>
+          <vodml-id>domain.polarization.PolVector.cval</vodml-id>
+          <name>cval</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>coords:domain.polarization.PolVectorEnum</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+      </dataType>
+
+      <objectType>
+        <vodml-id>domain.polarization.PolarizationFrame</vodml-id>
+        <name>PolarizationFrame</name>
+        <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <extends>
-        <vodml-ref>coords:dtypes.Uncertainty3D</vodml-ref>
-      </extends>
-      <attribute>
-        <vodml-id>dtypes.CovarianceMatrix3D.matrix</vodml-id>
-        <name>matrix</name>
+        <extends>
+          <vodml-ref>coords:CoordFrame</vodml-ref>
+        </extends>
+        <constraint>
+          <description>coordSpace:PolarizationSpace[1]</description>
+        </constraint>
+      </objectType>
+
+      <objectType>
+        <vodml-id>domain.polarization.PolarizationSpace</vodml-id>
+        <name>PolarizationSpace</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <datatype>
-          <vodml-ref>coords:dtypes.Matrix3x3</vodml-ref>
-        </datatype>
-        <multiplicity>
-          <minOccurs>1</minOccurs>
-          <maxOccurs>1</maxOccurs>
-        </multiplicity>
-      </attribute>
-    </dataType>
+        <extends>
+          <vodml-ref>coords:CoordSpace</vodml-ref>
+        </extends>
+        <constraint>
+          <description>coordAxis:DiscreteAxis[1]</description>
+        </constraint>
+      </objectType>
+
+    </package>
 
   </package>
 

Modified: trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml.validation-report.txt
==============================================================================
--- trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml.validation-report.txt	Sat Apr 29 00:32:42 2017	(r3994)
+++ trunk/projects/dm/vo-dml/models/STC2/prototype/coords/STCCoords-2.0.vo-dml.xml.validation-report.txt	Sat Apr 29 00:44:18 2017	(r3995)
@@ -1 +1,6 @@
-No errors found, VO-DML document passes Schematron validation.
+
+-------
+warning:
+------- 
+Attribute MultiCoordValue.cmpt has multiplicity 1..-1 which is STRONLY DISCOURAGED.
+  
\ No newline at end of file


More information about the Volutecommits mailing list