[Volute] r5274 - trunk/projects/dm/STC/Trans/vo-dml

Volute commit messages volutecommits at g-vo.org
Wed Dec 12 16:44:19 CET 2018


Author: mdittmar
Date: Wed Dec 12 16:44:17 2018
New Revision: 5274

Log:
first pass of WD

Added:
   trunk/projects/dm/STC/Trans/vo-dml/vo-dml.properties
Modified:
   trunk/projects/dm/STC/Trans/vo-dml/STC_trans-v1.0.html
   trunk/projects/dm/STC/Trans/vo-dml/STC_trans-v1.0.png
   trunk/projects/dm/STC/Trans/vo-dml/STC_trans-v1.0.vo-dml.xml

Modified: trunk/projects/dm/STC/Trans/vo-dml/STC_trans-v1.0.html
==============================================================================
--- trunk/projects/dm/STC/Trans/vo-dml/STC_trans-v1.0.html	Wed Dec 12 11:05:05 2018	(r5273)
+++ trunk/projects/dm/STC/Trans/vo-dml/STC_trans-v1.0.html	Wed Dec 12 16:44:17 2018	(r5274)
@@ -1,12 +1,12 @@
 <html xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vo-dml="http://www.ivoa.net/xml/VODML/v1">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>STC2 Transform Model</title>
+    <title>WCS Transform Model</title>
     <link rel="stylesheet" href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/style/ivoa_wg.css" type="text/css">
     <link rel="stylesheet" href="https://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/style/xmi.css" type="text/css">
   </head>
   <body>
-    <h1>STC2 Transform Model</h1>
+    <h1>WCS Transform Model</h1>
     <h2><a id="contents" name="contents">Table of Contents</a></h2>
     <div class="head">
       <table class=".toc">
@@ -24,53 +24,113 @@
         </tr>
         <tr>
           <td>2.1.1</td>
-          <td>    <a href="#Mappings">objectType:Mappings</a></td>
+          <td>    <a href="#Lookup">objectType:Lookup</a></td>
         </tr>
         <tr>
           <td>2.1.2</td>
-          <td>    <a href="#Projection">enumeration:Projection</a></td>
+          <td>    <a href="#LookupEntry">objectType:LookupEntry</a></td>
         </tr>
         <tr>
           <td>2.1.3</td>
-          <td>    <a href="#TLookup">objectType:TLookup</a></td>
+          <td>    <a href="#Matrix">objectType:Matrix</a></td>
         </tr>
         <tr>
           <td>2.1.4</td>
-          <td>    <a href="#TLookupEntry">objectType:TLookupEntry</a></td>
+          <td>    <a href="#MatrixElement">objectType:MatrixElement</a></td>
         </tr>
         <tr>
           <td>2.1.5</td>
-          <td>    <a href="#TMatrix">objectType:TMatrix</a></td>
+          <td>    <a href="#NumericEntry">objectType:NumericEntry</a></td>
         </tr>
         <tr>
           <td>2.1.6</td>
-          <td>    <a href="#TMatrixElement">objectType:TMatrixElement</a></td>
+          <td>    <a href="#PolyCoeff1D">objectType:PolyCoeff1D</a></td>
         </tr>
         <tr>
           <td>2.1.7</td>
-          <td>    <a href="#TNumericEntry">objectType:TNumericEntry</a></td>
+          <td>    <a href="#PolyCoeff2D">objectType:PolyCoeff2D</a></td>
         </tr>
         <tr>
           <td>2.1.8</td>
-          <td>    <a href="#TOperation">objectType:TOperation</a></td>
+          <td>    <a href="#Polynomial">objectType:Polynomial</a></td>
         </tr>
         <tr>
           <td>2.1.9</td>
-          <td>    <a href="#TProjection">objectType:TProjection</a></td>
+          <td>    <a href="#Polynomial1D">objectType:Polynomial1D</a></td>
         </tr>
         <tr>
           <td>2.1.10</td>
-          <td>    <a href="#TProjectionAxis">objectType:TProjectionAxis</a></td>
+          <td>    <a href="#Polynomial2D">objectType:Polynomial2D</a></td>
         </tr>
         <tr>
           <td>2.1.11</td>
-          <td>    <a href="#TStringEntry">objectType:TStringEntry</a></td>
+          <td>    <a href="#ProjectionParam">objectType:ProjectionParam</a></td>
         </tr>
         <tr>
           <td>2.1.12</td>
+          <td>    <a href="#Reorder">objectType:Reorder</a></td>
+        </tr>
+        <tr>
+          <td>2.1.13</td>
+          <td>    <a href="#Rotate">objectType:Rotate</a></td>
+        </tr>
+        <tr>
+          <td>2.1.14</td>
+          <td>    <a href="#Scale">objectType:Scale</a></td>
+        </tr>
+        <tr>
+          <td>2.1.15</td>
+          <td>    <a href="#Shift">objectType:Shift</a></td>
+        </tr>
+        <tr>
+          <td>2.1.16</td>
+          <td>    <a href="#SkyProjection">objectType:SkyProjection</a></td>
+        </tr>
+        <tr>
+          <td>2.1.17</td>
+          <td>    <a href="#SkyProjectionType">enumeration:SkyProjectionType</a></td>
+        </tr>
+        <tr>
+          <td>2.1.18</td>
+          <td>    <a href="#SpectralCoordType">enumeration:SpectralCoordType</a></td>
+        </tr>
+        <tr>
+          <td>2.1.19</td>
+          <td>    <a href="#SpectralProjection">objectType:SpectralProjection</a></td>
+        </tr>
+        <tr>
+          <td>2.1.20</td>
+          <td>    <a href="#SpectralProjectionType">enumeration:SpectralProjectionType</a></td>
+        </tr>
+        <tr>
+          <td>2.1.21</td>
+          <td>    <a href="#StringEntry">objectType:StringEntry</a></td>
+        </tr>
+        <tr>
+          <td>2.1.22</td>
+          <td>    <a href="#TComplexOperation">objectType:TComplexOperation</a></td>
+        </tr>
+        <tr>
+          <td>2.1.23</td>
+          <td>    <a href="#TJoin">objectType:TJoin</a></td>
+        </tr>
+        <tr>
+          <td>2.1.24</td>
+          <td>    <a href="#TOperation">objectType:TOperation</a></td>
+        </tr>
+        <tr>
+          <td>2.1.25</td>
           <td>    <a href="#Transform">objectType:Transform</a></td>
         </tr>
         <tr>
+          <td>2.1.26</td>
+          <td>    <a href="#Unit">objectType:Unit</a></td>
+        </tr>
+        <tr>
+          <td>2.1.27</td>
+          <td>    <a href="#WCSProjection">objectType:WCSProjection</a></td>
+        </tr>
+        <tr>
           <td>3.</td>
           <td>
                 <a href="#vodml-ids">vodml-id-s</a></td>
@@ -88,7 +148,7 @@
       </table>
     </div>
     <hr>
-    <h1><a name="model_section">1. Model: STC2 Transform Model (trans)</a></h1>
+    <h1><a name="model_section">1. Model: WCS Transform Model (trans)</a></h1>
     <table>
       <tr>
         <td align="right"><b>Authors</b></td>
@@ -98,23 +158,23 @@
       <tr>
         <td align="right"><b>Date</b></td>
         <td> : </td>
-        <td>2018-05-03T16:02:15</td>
+        <td>2018-12-11T16:48:52</td>
       </tr>
       <tr>
         <td align="right"><b>Version</b></td>
         <td> : </td>
-        <td>2.0</td>
+        <td>1.0</td>
       </tr>
       <tr>
         <td align="right">Previous version:</td>
         <td> : </td>
-        <td><a href="0.x">0.x</a></td>
+        <td><a href="0.0">0.0</a></td>
       </tr>
       <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 transform model defines mathematical operations which can be combined in parallel and/or in series, to form complex transformation
+          expressions.
           
         </td>
       </tr>
@@ -130,19 +190,34 @@
       <tr>
         <td colspan="3"></td>
       </tr>
-    </table><img src="STC_trans-v2.0.png" usemap="#GVmap"><map id="GVmap" name="GVmap">
-<area shape="rect" id="node2" href="#Projection" title="{<<enumeration>>\nProjection|+LOG\l+TAN\l+SIN\l+STG\l+ARC\l+ZEA\l+AIR\l+CEA\l+CAR\l+MER\l+SFL\l+PAR\l+MOL\l+AIT\l+COE\l+COD\l+COO\l+BON\l+PCO\l+TSC\l+CSC\l+QSC\l}" alt="" coords="53,6,152,349"/>
-<area shape="rect" id="node3" href="#Transform" title="{Transform}" alt="" coords="176,423,248,473"/>
-<area shape="rect" id="node4" href="#TOperation" title="{TOperation}" alt="" coords="185,561,257,610"/>
-<area shape="rect" id="node5" href="#TProjection" title="{TProjection|+algorithm : trans:Projection\l}" alt="" coords="5,423,152,473"/>
-<area shape="rect" id="node6" href="#TProjectionAxis" title="{TProjectionAxis|+nativeRefValue : ivoa:real\l+targetRefValue : ivoa:real\l+scale : ivoa:real\l}" alt="" coords="8,547,149,623"/>
-<area shape="rect" id="node7" href="#Mappings" title="{Mappings}" alt="" coords="176,153,248,202"/>
-<area shape="rect" id="node8" href="#TMatrix" title="{TMatrix|+M : ivoa:nonnegativeInteger\l+N : ivoa:nonnegativeInteger\l}" alt="" coords="272,417,421,479"/>
-<area shape="rect" id="node9" href="#TMatrixElement" title="{TMatrixElement|+m : ivoa:nonnegativeInteger\l+n : ivoa:nonnegativeInteger\l+value : ivoa:real\l}" alt="" coords="289,547,436,623"/>
-<area shape="rect" id="node10" href="#TLookup" title="{TLookup}" alt="" coords="445,423,517,473"/>
-<area shape="rect" id="node11" href="#TLookupEntry" title="{TLookupEntry}" alt="" coords="561,561,647,610"/>
-<area shape="rect" id="node12" href="#TNumericEntry" title="{TNumericEntry|+nativeValue : ivoa:real\l+targetValue : ivoa:real\l}" alt="" coords="541,417,667,479"/>
-<area shape="rect" id="node13" href="#TStringEntry" title="{TStringEntry|+nativeValue : ivoa:integer\l+targetValue : ivoa:string\l}" alt="" coords="691,417,829,479"/>
+    </table><img src="STC_trans-v1.0.png" usemap="#GVmap"><map id="GVmap" name="GVmap">
+<area shape="rect" id="node1" href="#SkyProjectionType" title="{<<enumeration>>\nSkyProjectionType|+AZP\l+SZP\l+TAN\l+STG\l+SIN\l+ARC\l+ZPN\l+ZEA\l+AIR\l+CYP\l+CEA\l+CAR\l+MER\l+SFL\l+PAR\l+MOL\l+AIT\l+COP\l+COE\l+COD\l+COO\l+BON\l+PCO\l+TSC\l+CSC\l+QSC\l}" alt="" coords="117,6,221,365"/>
+<area shape="rect" id="node2" href="#SpectralProjectionType" title="{<<enumeration>>\nSpectralProjectionType|+F2W\l+F2V\l+F2A\l+W2F\l+W2V\l+W2A\l+V2F\l+V2W\l+V2A\l+A2F\l+A2W\l+A2V\l+LOG\l+GRI\l+GRA\l}" alt="" coords="246,72,369,299"/>
+<area shape="rect" id="node3" href="#SpectralCoordType" title="{<<enumeration>>\nSpectralCoordType|+FREQ\l+ENER\l+WAVN\l+VRAD\l+WAVE\l+VOPT\l+ZOPT\l+AWAV\l+VELO\l+BETA\l}" alt="" coords="395,102,501,269"/>
+<area shape="rect" id="node4" href="#Transform" title="{Transform}" alt="" coords="1208,161,1280,210"/>
+<area shape="rect" id="node27" href="#TComplexOperation" title="{TComplexOperation}" alt="" coords="1141,434,1251,483"/>
+<area shape="rect" id="node5" href="#TJoin" title="{TJoin}" alt="" coords="1112,161,1184,210"/>
+<area shape="rect" id="node6" href="#TOperation" title="{TOperation}" alt="" coords="1116,563,1188,613"/>
+<area shape="rect" id="node7" href="#Unit" title="{Unit}" alt="" coords="735,434,807,483"/>
+<area shape="rect" id="node8" href="#Shift" title="{Shift|+shift : ivoa:real\l}" alt="" coords="831,434,925,483"/>
+<area shape="rect" id="node9" href="#Scale" title="{Scale|+factor : ivoa:real\l}" alt="" coords="1276,434,1377,483"/>
+<area shape="rect" id="node10" href="#Rotate" title="{Rotate|+angle : ivoa:real\l}" alt="" coords="1401,434,1500,483"/>
+<area shape="rect" id="node11" href="#Matrix" title="{Matrix|+M : ivoa:nonnegativeInteger\l+N : ivoa:nonnegativeInteger\l}" alt="" coords="183,429,332,488"/>
+<area shape="rect" id="node12" href="#MatrixElement" title="{MatrixElement|+m : ivoa:nonnegativeInteger\l+n : ivoa:nonnegativeInteger\l+value : ivoa:real\l}" alt="" coords="183,553,331,623"/>
+<area shape="rect" id="node13" href="#Polynomial" title="{Polynomial|+order : ivoa:nonnegativeInteger\l}" alt="" coords="548,434,711,483"/>
+<area shape="rect" id="node14" href="#Polynomial1D" title="{Polynomial1D}" alt="" coords="525,161,608,210"/>
+<area shape="rect" id="node16" href="#PolyCoeff1D" title="{PolyCoeff1D|+coeff : ivoa:real\l+power : ivoa:nonnegativeInteger\l}" alt="" coords="357,429,523,488"/>
+<area shape="rect" id="node15" href="#Polynomial2D" title="{Polynomial2D}" alt="" coords="668,161,751,210"/>
+<area shape="rect" id="node17" href="#PolyCoeff2D" title="{PolyCoeff2D|+coeff : ivoa:real\l+power : ivoa:nonnegativeInteger\l}" alt="" coords="950,429,1116,488"/>
+<area shape="rect" id="node18" href="#WCSProjection" title="{WCSProjection}" alt="" coords="1525,434,1613,483"/>
+<area shape="rect" id="node19" href="#ProjectionParam" title="{ProjectionParam|+name : ivoa:string\l+value : ivoa:real\l}" alt="" coords="1517,559,1621,617"/>
+<area shape="rect" id="node20" href="#SkyProjection" title="{SkyProjection|+referenceValue : ivoa:real\l+algorithm : trans:SkyProjectionType\l}" alt="" coords="1615,156,1799,215"/>
+<area shape="rect" id="node21" href="#SpectralProjection" title="{SpectralProjection|+referenceValue : ivoa:real\l+algorithm : trans:SpectralProjectionType\l+coordType : trans:SpectralCoordType\l}" alt="" coords="1386,150,1589,221"/>
+<area shape="rect" id="node22" href="#Lookup" title="{Lookup}" alt="" coords="1639,434,1711,483"/>
+<area shape="rect" id="node23" href="#LookupEntry" title="{LookupEntry}" alt="" coords="1759,563,1837,613"/>
+<area shape="rect" id="node24" href="#NumericEntry" title="{NumericEntry|+nativeValue : ivoa:real\l+targetValue : ivoa:real\l}" alt="" coords="1735,429,1861,488"/>
+<area shape="rect" id="node25" href="#StringEntry" title="{StringEntry|+nativeValue : ivoa:integer\l+targetValue : ivoa:string\l}" alt="" coords="1886,429,2025,488"/>
+<area shape="rect" id="node26" href="#Reorder" title="{Reorder|+in : ivoa:nonnegativeInteger\l+out : ivoa:nonnegativeInteger\l}" alt="" coords="5,429,157,488"/>
 </map>
 
     <hr>
@@ -162,28 +237,27 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#Mappings">Mappings</a> <a href="#TLookup">TLookup</a> <a href="#TLookupEntry">TLookupEntry</a> <a href="#TMatrix">TMatrix</a> <a href="#TMatrixElement">TMatrixElement</a> <a href="#TNumericEntry">TNumericEntry</a> <a href="#TOperation">TOperation</a> <a href="#TProjection">TProjection</a> <a href="#TProjectionAxis">TProjectionAxis</a> <a href="#TStringEntry">TStringEntry</a> <a href="#Transform">Transform</a> 
+        <td colspan="2" class="feature-detail"><a href="#Lookup">Lookup</a> <a href="#LookupEntry">LookupEntry</a> <a href="#Matrix">Matrix</a> <a href="#MatrixElement">MatrixElement</a> <a href="#NumericEntry">NumericEntry</a> <a href="#PolyCoeff1D">PolyCoeff1D</a> <a href="#PolyCoeff2D">PolyCoeff2D</a> <a href="#Polynomial">Polynomial</a> <a href="#Polynomial1D">Polynomial1D</a> <a href="#Polynomial2D">Polynomial2D</a> <a href="#ProjectionParam">ProjectionParam</a> <a href="#Reorder">Reorder</a> <a href="#Rotate">Rotate</a> <a href="#Scale">Scale</a> <a href="#Shift">Shift</a> <a href="#SkyProjection">SkyProjection</a> <a href="#SpectralProjection">SpectralProjection</a> <a href="#StringEntry">StringEntry</a> <a href="#TComplexOperation">TComplexOperation</a> <a href="#TJoin">TJoin</a> <a href="#TOperation">TOperation</a> <a href="#Transform">Transform</a> <a href="#Unit">Unit</a> <a href="#WCSProjection">WCSProjection</a> 
         </td>
       </tr>
       <tr>
         <td width="20%" class="info-title">Enumerations</td>
-        <td colspan="2" class="feature-detail"><a href="#Projection">Projection</a> 
+        <td colspan="2" class="feature-detail"><a href="#SkyProjectionType">SkyProjectionType</a> <a href="#SpectralCoordType">SpectralCoordType</a> <a href="#SpectralProjectionType">SpectralProjectionType</a> 
         </td>
       </tr>
     </table>
-    <h3><a name="Mappings"></a>2.1.1 objectType: Mappings
+    <h3><a name="Lookup"></a>2.1.1 objectType: Lookup
     </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">Mappings</td>
+          <td class="objecttype-name" colspan="1">Lookup</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">Defines a lookup table operation.  The Lookup is comprised of a series of value pairs (LookupEntry).  All members of the series
+            MUST be of the same type.
           </td>
         </tr>
         <tr>
@@ -193,6 +267,10 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#TOperation">TOperation [trans:TOperation]</a></td>
+                    </tr>
+                    <tr>
                       <td colspan="3" class="info-title">compositions</td>
                     </tr>
                     <tr>
@@ -201,13 +279,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="Mappings.transforms"></a><b>transforms</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="Lookup.entry"></a><b>entry</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#Transform">Transform [trans:Transform]</a></td>
+                      <td class="feature-detail"><a href="#LookupEntry">LookupEntry [trans:LookupEntry]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">Mappings.transforms</td>
+                      <td class="feature-detail">Lookup.entry</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -219,10 +297,7 @@
                     </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">Set of lookup table entries forming a discrete mapping from the native space to the target space.</td>
                     </tr>
                   </table>
                 </td>
@@ -231,327 +306,54 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="Projection"></a>2.1.2 enumeration: Projection
+    </div><br><h3><a name="LookupEntry"></a>2.1.2 objectType: LookupEntry
     </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="2">Projection</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="Projection.LOG"></a>LOG
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.LOG</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="Projection.TAN"></a>TAN
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.TAN</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="Projection.SIN"></a>SIN
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.SIN</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="Projection.STG"></a>STG
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.STG</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="Projection.ARC"></a>ARC
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.ARC</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="Projection.ZEA"></a>ZEA
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.ZEA</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="Projection.AIR"></a>AIR
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.AIR</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="Projection.CEA"></a>CEA
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.CEA</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="Projection.CAR"></a>CAR
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.CAR</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="Projection.MER"></a>MER
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.MER</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="Projection.SFL"></a>SFL
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.SFL</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="Projection.PAR"></a>PAR
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.PAR</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="Projection.MOL"></a>MOL
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.MOL</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="Projection.AIT"></a>AIT
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.AIT</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="Projection.COE"></a>COE
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.COE</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="Projection.COD"></a>COD
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.COD</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="Projection.COO"></a>COO
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.COO</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="Projection.BON"></a>BON
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.BON</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="Projection.PCO"></a>PCO
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.PCO</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="Projection.TSC"></a>TSC
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.TSC</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="Projection.CSC"></a>CSC
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.CSC</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="Projection.QSC"></a>QSC
-        </td>
-        <td class="feature-heading">vodml-id</td>
-        <td class="feature-detail">Projection.QSC</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="TLookup"></a>2.1.3 objectType: TLookup
+    <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">LookupEntry</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">This is an abstract head of lookup table entry objects.  Each entry provides a discrete translation of a 'native' value to
+            the corresponding 'target' value. 
+          </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" width="20%">abstract</td>
+                      <td class="feature-detail" colspan="3">True</td>
+                    </tr>
+                    <tr>
+                      <td class="info-title" width="20%">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#NumericEntry">NumericEntry</a> <a href="#StringEntry">StringEntry</a> 
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="Matrix"></a>2.1.3 objectType: Matrix
     </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">TLookup</td>
+          <td class="objecttype-name" colspan="1">Matrix</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 M x N matrix operation.  Each cell of the matrix is provided by a MatrixElement object.  Missing elements should be considerd
+            to equal 0. 
           </td>
         </tr>
         <tr>
@@ -565,6 +367,48 @@
                       <td colspan="3" class="feature-detail"><a href="#TOperation">TOperation [trans:TOperation]</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="Matrix.M"></a><b>M</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/vo-dml/IVOA-v1.0.html#nonnegativeInteger">nonnegativeInteger</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">Matrix.M</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">Number of rows in the matrix.</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="Matrix.N"></a><b>N</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/vo-dml/IVOA-v1.0.html#nonnegativeInteger">nonnegativeInteger</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">Matrix.N</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">Number of columns in the matrix.</td>
+                    </tr>
+                    <tr>
                       <td colspan="3" class="info-title">compositions</td>
                     </tr>
                     <tr>
@@ -573,17 +417,17 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="TLookup.entry"></a><b>entry</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="Matrix.element"></a><b>element</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#TLookupEntry">TLookupEntry [trans:TLookupEntry]</a></td>
+                      <td class="feature-detail"><a href="#MatrixElement">MatrixElement [trans:MatrixElement]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">TLookup.entry</td>
+                      <td class="feature-detail">Matrix.element</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1..*</td>
+                      <td class="feature-detail">0..*</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">isOrdered</td>
@@ -591,11 +435,16 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
+                      <td class="feature-detail">Collection of MatrixElements which define each cell of the matrix.  The total number of elements MUST NOT exceed M*N, any
+                        missing elements result a cell with value=0.0.
                       </td>
                     </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">constraints</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" colspan="3">Matrix.element[] maxlength = M*N</td>
+                    </tr>
                   </table>
                 </td>
               </tr>
@@ -603,20 +452,17 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="TLookupEntry"></a>2.1.4 objectType: TLookupEntry
+    </div><br><h3><a name="MatrixElement"></a>2.1.4 objectType: MatrixElement
     </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">TLookupEntry</td>
+          <td class="objecttype-name" colspan="1">MatrixElement</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 value of cell m,n in an M x N matrix.</td>
         </tr>
         <tr>
           <td colspan="2">
@@ -625,13 +471,63 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td class="info-title" width="20%">abstract</td>
-                      <td class="feature-detail" colspan="3">True</td>
+                      <td colspan="3" class="info-title">attributes</td>
                     </tr>
                     <tr>
-                      <td class="info-title" width="20%">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#TNumericEntry">TNumericEntry</a> <a href="#TStringEntry">TStringEntry</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 class="feature-detail" valign="top" rowspan="4"><a name="MatrixElement.m"></a><b>m</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/vo-dml/IVOA-v1.0.html#nonnegativeInteger">nonnegativeInteger</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">MatrixElement.m</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">Matrix cell row number.</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="MatrixElement.n"></a><b>n</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/vo-dml/IVOA-v1.0.html#nonnegativeInteger">nonnegativeInteger</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">MatrixElement.n</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">Matrix cell column number.</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="MatrixElement.value"></a><b>value</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/vo-dml/IVOA-v1.0.html#real">real</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">MatrixElement.value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">Matrix cell value.</td>
                     </tr>
                   </table>
                 </td>
@@ -640,20 +536,17 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="TMatrix"></a>2.1.5 objectType: TMatrix
+    </div><br><h3><a name="NumericEntry"></a>2.1.5 objectType: NumericEntry
     </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">TMatrix</td>
+          <td class="objecttype-name" colspan="1">NumericEntry</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">A 1-Dimensional discrete mapping of numeric values. </td>
         </tr>
         <tr>
           <td colspan="2">
@@ -663,7 +556,7 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#TOperation">TOperation [trans:TOperation]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#LookupEntry">LookupEntry [trans:LookupEntry]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -674,13 +567,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="TMatrix.M"></a><b>M</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="NumericEntry.nativeValue"></a><b>nativeValue</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/vo-dml/IVOA-v1.0.html#nonnegativeInteger">nonnegativeInteger</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/vo-dml/IVOA-v1.0.html#real">real</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">TMatrix.M</td>
+                      <td class="feature-detail">NumericEntry.nativeValue</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -688,19 +581,16 @@
                     </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">The native, or reference, value of the lookup entry.</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="TMatrix.N"></a><b>N</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="NumericEntry.targetValue"></a><b>targetValue</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/vo-dml/IVOA-v1.0.html#nonnegativeInteger">nonnegativeInteger</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/vo-dml/IVOA-v1.0.html#real">real</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">TMatrix.N</td>
+                      <td class="feature-detail">NumericEntry.targetValue</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -708,13 +598,38 @@
                     </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">The target, or resulting, value of the lookup entry.</td>
                     </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="PolyCoeff1D"></a>2.1.6 objectType: PolyCoeff1D
+    </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">PolyCoeff1D</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">A term of the polynomial expression.  This object provides the coefficient (c) and power (p) of the term, forming the expression
+            c*X**p.
+            
+          </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 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>
@@ -722,34 +637,38 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="TMatrix.element"></a><b>element</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="PolyCoeff1D.coeff"></a><b>coeff</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#TMatrixElement">TMatrixElement [trans:TMatrixElement]</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/vo-dml/IVOA-v1.0.html#real">real</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">TMatrix.element</td>
+                      <td class="feature-detail">PolyCoeff1D.coeff</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">0..*</td>
+                      <td class="feature-detail">1</td>
                     </tr>
                     <tr>
-                      <td class="feature-heading">isOrdered</td>
-                      <td class="feature-detail">false</td>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">Multiplicitive coefficient of the term.</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" rowspan="4"><a name="PolyCoeff1D.power"></a><b>power</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/vo-dml/IVOA-v1.0.html#nonnegativeInteger">nonnegativeInteger</a></td>
                     </tr>
                     <tr>
-                      <td colspan="3" class="info-title">constraints</td>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">PolyCoeff1D.power</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" colspan="3">TMatrix.element[] maxlength = M*N</td>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">The power to raise the value for this term.</td>
                     </tr>
                   </table>
                 </td>
@@ -758,18 +677,18 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="TMatrixElement"></a>2.1.6 objectType: TMatrixElement
+    </div><br><h3><a name="PolyCoeff2D"></a>2.1.7 objectType: PolyCoeff2D
     </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">TMatrixElement</td>
+          <td class="objecttype-name" colspan="1">PolyCoeff2D</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">A term of the polynomial expression.  This object provides the coefficient (c) and power (p) of the term, forming the expression
+            c*X**p.
             
           </td>
         </tr>
@@ -788,13 +707,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="TMatrixElement.m"></a><b>m</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="PolyCoeff2D.coeff"></a><b>coeff</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/vo-dml/IVOA-v1.0.html#nonnegativeInteger">nonnegativeInteger</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/vo-dml/IVOA-v1.0.html#real">real</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">TMatrixElement.m</td>
+                      <td class="feature-detail">PolyCoeff2D.coeff</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -802,39 +721,79 @@
                     </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">Multiplicitive coefficient of the term.</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="TMatrixElement.n"></a><b>n</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="PolyCoeff2D.power"></a><b>power</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/vo-dml/IVOA-v1.0.html#nonnegativeInteger">nonnegativeInteger</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">TMatrixElement.n</td>
+                      <td class="feature-detail">PolyCoeff2D.power</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1</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="feature-detail">The power to raise the values for this term in each dimension.</td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="Polynomial"></a>2.1.8 objectType: Polynomial
+    </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">Polynomial</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">Abstract head of a family of Polynomial distortion operations.</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">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#TOperation">TOperation [trans:TOperation]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="info-title" width="20%">abstract</td>
+                      <td class="feature-detail" colspan="3">True</td>
+                    </tr>
+                    <tr>
+                      <td class="info-title" width="20%">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#Polynomial1D">Polynomial1D</a> <a href="#Polynomial2D">Polynomial2D</a> 
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="TMatrixElement.value"></a><b>value</b></td>
+                      <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="Polynomial.order"></a><b>order</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/vo-dml/IVOA-v1.0.html#real">real</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/vo-dml/IVOA-v1.0.html#nonnegativeInteger">nonnegativeInteger</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">TMatrixElement.value</td>
+                      <td class="feature-detail">Polynomial.order</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -842,10 +801,7 @@
                     </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">The order, or degree, of the polynomial expression.</td>
                     </tr>
                   </table>
                 </td>
@@ -854,19 +810,78 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="TNumericEntry"></a>2.1.7 objectType: TNumericEntry
+    </div><br><h3><a name="Polynomial1D"></a>2.1.9 objectType: Polynomial1D
     </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">TNumericEntry</td>
+          <td class="objecttype-name" colspan="1">Polynomial1D</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">A 1-Dimensional Polynomial transform represented by the expression:  X' = SUM( Ci*X**Pi),  i=0..order.  Each term is provided
+            by a PolyCoeff1D object.  Missing terms are considered to have a coefficient of 0.0.
+          </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">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#Polynomial">Polynomial [trans:Polynomial]</a></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="Polynomial1D.term"></a><b>term</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#PolyCoeff1D">PolyCoeff1D [trans:PolyCoeff1D]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">Polynomial1D.term</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">A term in the polynomial expression.</td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="Polynomial2D"></a>2.1.10 objectType: Polynomial2D
+    </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">Polynomial2D</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">A 2-Dimensional Polynomial transform represented by the expression:  X' = SUMi,j( Cij*X**P1i*Y**P2j),  i=0..order, j=0..order.
+            Each term is provided by a PolyCoeff2D object.  Missing terms are considered to have a coefficient of 0.0.
           </td>
         </tr>
         <tr>
@@ -877,9 +892,65 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#TLookupEntry">TLookupEntry [trans:TLookupEntry]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#Polynomial">Polynomial [trans:Polynomial]</a></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="Polynomial2D.term"></a><b>term</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#PolyCoeff2D">PolyCoeff2D [trans:PolyCoeff2D]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">Polynomial2D.term</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">A term in the polynomial expression.</td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="ProjectionParam"></a>2.1.11 objectType: ProjectionParam
+    </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">ProjectionParam</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">Simple parameter specification for WCS Projections.  The parameter is modeled as a simple name/value pair.  The details of
+            expectations for the various projection algorithms is left to the WCS paper describing the algorithm.
+          </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 colspan="3" class="info-title">attributes</td>
                     </tr>
                     <tr>
@@ -888,13 +959,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="TNumericEntry.nativeValue"></a><b>nativeValue</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="ProjectionParam.name"></a><b>name</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/vo-dml/IVOA-v1.0.html#real">real</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/vo-dml/IVOA-v1.0.html#string">string</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">TNumericEntry.nativeValue</td>
+                      <td class="feature-detail">ProjectionParam.name</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -902,19 +973,16 @@
                     </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">The parameter name.  This is typically, but not always, given as a "PVi_j" key.</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="TNumericEntry.targetValue"></a><b>targetValue</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="ProjectionParam.value"></a><b>value</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/vo-dml/IVOA-v1.0.html#real">real</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">TNumericEntry.targetValue</td>
+                      <td class="feature-detail">ProjectionParam.value</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -922,10 +990,7 @@
                     </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">The value for the parameter. </td>
                     </tr>
                   </table>
                 </td>
@@ -934,19 +999,19 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="TOperation"></a>2.1.8 objectType: TOperation
+    </div><br><h3><a name="Reorder"></a>2.1.12 objectType: Reorder
     </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">TOperation</td>
+          <td class="objecttype-name" colspan="1">Reorder</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">This operation facilitates the specification of axis order shuffling between operations.  For example, if we have a 3-dimensional
+            coordinate (x,y,z) and wish to perform a 2-dimensional transform on the (x,z) plane, this operation, joined, allows us to
+            define a new axis order  (y,x,z) to feed into the next step ( 1D + 2D operations).
           </td>
         </tr>
         <tr>
@@ -956,13 +1021,50 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
-                      <td class="info-title" width="20%">abstract</td>
-                      <td class="feature-detail" colspan="3">True</td>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#TOperation">TOperation [trans:TOperation]</a></td>
                     </tr>
                     <tr>
-                      <td class="info-title" width="20%">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#TLookup">TLookup</a> <a href="#TMatrix">TMatrix</a> <a href="#TProjection">TProjection</a> 
-                      </td>
+                      <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="Reorder.in"></a><b>in</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/vo-dml/IVOA-v1.0.html#nonnegativeInteger">nonnegativeInteger</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">Reorder.in</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">The input (original) axis/dimension number.</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="Reorder.out"></a><b>out</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/vo-dml/IVOA-v1.0.html#nonnegativeInteger">nonnegativeInteger</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">Reorder.out</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">The output (target) axis/dimension number.</td>
                     </tr>
                   </table>
                 </td>
@@ -971,20 +1073,17 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="TProjection"></a>2.1.9 objectType: TProjection
+    </div><br><h3><a name="Rotate"></a>2.1.13 objectType: Rotate
     </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">TProjection</td>
+          <td class="objecttype-name" colspan="1">Rotate</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">A 2-Dimensional rotation operation.  </td>
         </tr>
         <tr>
           <td colspan="2">
@@ -1005,13 +1104,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="TProjection.algorithm"></a><b>algorithm</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="Rotate.angle"></a><b>angle</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#Projection">Projection [trans:Projection]</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/vo-dml/IVOA-v1.0.html#real">real</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">TProjection.algorithm</td>
+                      <td class="feature-detail">Rotate.angle</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1019,13 +1118,39 @@
                     </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">Rotation angle in degrees, applied in counter-clockwise direction.</td>
                     </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="Scale"></a>2.1.14 objectType: Scale
+    </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">Scale</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">A 1-Dimensional operator for simple scaling. ( X' = factor*X )</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 colspan="3" class="info-title">compositions</td>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#TOperation">TOperation [trans:TOperation]</a></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
                     </tr>
                     <tr>
                       <td class="feature-heading" width="20%">name</td>
@@ -1033,28 +1158,75 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="TProjection.axis"></a><b>axis</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="Scale.factor"></a><b>factor</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#TProjectionAxis">TProjectionAxis [trans:TProjectionAxis]</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/vo-dml/IVOA-v1.0.html#real">real</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">TProjection.axis</td>
+                      <td class="feature-detail">Scale.factor</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1..2</td>
+                      <td class="feature-detail">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">The scale factor.</td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="Shift"></a>2.1.15 objectType: Shift
+    </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">Shift</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">A 1-Dimensional operation defining a simple offset.  ( X' = X + shift )</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">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#TOperation">TOperation [trans:TOperation]</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="Shift.shift"></a><b>shift</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/vo-dml/IVOA-v1.0.html#real">real</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">Shift.shift</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">The amount of offset to apply.</td>
                     </tr>
                   </table>
                 </td>
@@ -1063,19 +1235,20 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="TProjectionAxis"></a>2.1.10 objectType: TProjectionAxis
+    </div><br><h3><a name="SkyProjection"></a>2.1.16 objectType: SkyProjection
     </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">TProjectionAxis</td>
+          <td class="objecttype-name" colspan="1">SkyProjection</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">This class represents a two-dimensional projection of sky as detailed in the FITS WCS paper II.  As in the paper, this operation
+            picks up from the intermediate coordinate system, AFTER the application of the linear transform from pixel to intermediate
+            space.  In this model, the full transform from pixel to world is accomplished with a two-stage Transform, first applying the
+            linear operations via a Matrix or other component operations, followed by the SkyProjection operation.
           </td>
         </tr>
         <tr>
@@ -1085,6 +1258,10 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#WCSProjection">WCSProjection [trans:WCSProjection]</a></td>
+                    </tr>
+                    <tr>
                       <td colspan="3" class="info-title">attributes</td>
                     </tr>
                     <tr>
@@ -1093,13 +1270,30 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="TProjectionAxis.nativeRefValue"></a><b>nativeRefValue</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="SkyProjection.referenceValue"></a><b>referenceValue</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/vo-dml/IVOA-v1.0.html#real">real</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">TProjectionAxis.nativeRefValue</td>
+                      <td class="feature-detail">SkyProjection.referenceValue</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">The target reference values in each dimension.  Equivalent to 'crval' in FITS WCS representations.</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="SkyProjection.algorithm"></a><b>algorithm</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#SkyProjectionType">SkyProjectionType [trans:SkyProjectionType]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">SkyProjection.algorithm</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1107,19 +1301,453 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
+                      <td class="feature-detail">The projection algorithm to apply.  The value MUST be taken from the enumeration of standard sky projection algorithms.  Extracted
+                        from 'ctype' in the FITS WCS representations.
                       </td>
                     </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="SkyProjectionType"></a>2.1.17 enumeration: SkyProjectionType
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="2">SkyProjectionType</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="2">Enumeration of non-linear celestial projection algorithm codes as listed in Table 13 of the FITS WCS paper II.</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="SkyProjectionType.AZP"></a>AZP
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.AZP</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Zenithal perspective</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.SZP"></a>SZP
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.SZP</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Slant zenithal perspective</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.TAN"></a>TAN
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.TAN</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Gnomonic (Tangent plane projection)</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.STG"></a>STG
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.STG</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Stereographic</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.SIN"></a>SIN
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.SIN</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Slant orthographic (Sine projection)</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.ARC"></a>ARC
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.ARC</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Zenithal equidistant</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.ZPN"></a>ZPN
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.ZPN</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Zenithal polynomial</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.ZEA"></a>ZEA
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.ZEA</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Zenethal equal-area</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.AIR"></a>AIR
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.AIR</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Airy</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.CYP"></a>CYP
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.CYP</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Cylindrical perspective</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.CEA"></a>CEA
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.CEA</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Cylindrical equal-area</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.CAR"></a>CAR
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.CAR</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Plate carree</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.MER"></a>MER
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.MER</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Mercator</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.SFL"></a>SFL
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.SFL</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Sanson-Flamsteed</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.PAR"></a>PAR
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.PAR</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Parabolic</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.MOL"></a>MOL
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.MOL</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Mollweide</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.AIT"></a>AIT
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.AIT</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Hammer-Aitoff</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.COP"></a>COP
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.COP</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Conic perspective</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.COE"></a>COE
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.COE</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Conic equal-area</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.COD"></a>COD
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.COD</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Conic equidistant</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.COO"></a>COO
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.COO</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Conic orthomorphic</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.BON"></a>BON
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.BON</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Bonne equal-area</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.PCO"></a>PCO
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.PCO</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Polyconic</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.TSC"></a>TSC
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.TSC</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Tangential spherical cube</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.CSC"></a>CSC
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.CSC</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">COBE Quadrilateralized spherical cube</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SkyProjectionType.QSC"></a>QSC
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SkyProjectionType.QSC</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Quadrilateralized spherical cube</td>
+      </tr>
+    </table><br><h3><a name="SpectralCoordType"></a>2.1.18 enumeration: SpectralCoordType
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="2">SpectralCoordType</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="2">Enumeration of spectral coordinate types as listed in Table 1 of the FITS WCS paper III.</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="SpectralCoordType.FREQ"></a>FREQ
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralCoordType.FREQ</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Frequency</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralCoordType.ENER"></a>ENER
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralCoordType.ENER</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Energy</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralCoordType.WAVN"></a>WAVN
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralCoordType.WAVN</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Wavenumber</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralCoordType.VRAD"></a>VRAD
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralCoordType.VRAD</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Radio velocity</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralCoordType.WAVE"></a>WAVE
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralCoordType.WAVE</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Vacuum wavelength</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralCoordType.VOPT"></a>VOPT
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralCoordType.VOPT</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Optical velocity</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralCoordType.ZOPT"></a>ZOPT
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralCoordType.ZOPT</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Redshift</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralCoordType.AWAV"></a>AWAV
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralCoordType.AWAV</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Air wavelength</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralCoordType.VELO"></a>VELO
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralCoordType.VELO</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Apparent radial velocity</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralCoordType.BETA"></a>BETA
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralCoordType.BETA</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Beta factor (v/c)</td>
+      </tr>
+    </table><br><h3><a name="SpectralProjection"></a>2.1.19 objectType: SpectralProjection
+    </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">SpectralProjection</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">This class represents a nonlinear one-dimensional spectral transform as detailed in the FITS WCS paper III.</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">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#WCSProjection">WCSProjection [trans:WCSProjection]</a></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
+                    </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="TProjectionAxis.targetRefValue"></a><b>targetRefValue</b></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 class="feature-detail" valign="top" rowspan="4"><a name="SpectralProjection.referenceValue"></a><b>referenceValue</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/vo-dml/IVOA-v1.0.html#real">real</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">TProjectionAxis.targetRefValue</td>
+                      <td class="feature-detail">SpectralProjection.referenceValue</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1127,19 +1755,35 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
+                      <td class="feature-detail">The target reference value for the axis.  Equivalent to 'crval' in FITS WCS representations.</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="SpectralProjection.algorithm"></a><b>algorithm</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#SpectralProjectionType">SpectralProjectionType [trans:SpectralProjectionType]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">SpectralProjection.algorithm</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">The projection algorithm to apply.  The value MUST be taken from the enumeration of non-linear spectral projection algorithms.
+                        Extracted from 'ctype' in FITS WCS representations.
                       </td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="TProjectionAxis.scale"></a><b>scale</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="SpectralProjection.coordType"></a><b>coordType</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/vo-dml/IVOA-v1.0.html#real">real</a></td>
+                      <td class="feature-detail"><a href="#SpectralCoordType">SpectralCoordType [trans:SpectralCoordType]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">TProjectionAxis.scale</td>
+                      <td class="feature-detail">SpectralProjection.coordType</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1147,9 +1791,8 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
+                      <td class="feature-detail">The resulting spectral coordinate type code.  Values MUST be taken from the enumerated list of spectral coordinate types.
+                        Extracted from 'ctype' in FITS WCS representations.
                       </td>
                     </tr>
                   </table>
@@ -1159,19 +1802,190 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="TStringEntry"></a>2.1.11 objectType: TStringEntry
+    </div><br><h3><a name="SpectralProjectionType"></a>2.1.20 enumeration: SpectralProjectionType
+    </h3>
+    <table border="1" width="100%" cellspacing="2">
+      <tr>
+        <td class="objecttype-title" width="20%">vodml-id</td>
+        <td class="objecttype-name" colspan="2">SpectralProjectionType</td>
+      </tr>
+      <tr>
+        <td class="info-title">description</td>
+        <td class="feature-detail" colspan="2">Enumeration of non-linear spectral projection algorithm codes as listed in Table 2 of the FITS WCS paper III.
+          NOTE: We exclude the TAB code from this list, that type is handled by the Lookup operation in this model.
+          
+        </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="SpectralProjectionType.F2W"></a>F2W
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralProjectionType.F2W</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Frequency - Wavelength</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralProjectionType.F2V"></a>F2V
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralProjectionType.F2V</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Frequency - Apparent radial velocity</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralProjectionType.F2A"></a>F2A
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralProjectionType.F2A</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Frequency - Air wavelength</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralProjectionType.W2F"></a>W2F
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralProjectionType.W2F</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Wavelength - Frequency</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralProjectionType.W2V"></a>W2V
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralProjectionType.W2V</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Wavelength - Apparent radial velocity</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralProjectionType.W2A"></a>W2A
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralProjectionType.W2A</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Wavelength - Air wavelength</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralProjectionType.V2F"></a>V2F
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralProjectionType.V2F</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Apparent radial velocity - Frequency</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralProjectionType.V2W"></a>V2W
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralProjectionType.V2W</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Apparent radial velocity - Wavelength</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralProjectionType.V2A"></a>V2A
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralProjectionType.V2A</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Apparent radial velocity - Air wavelength</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralProjectionType.A2F"></a>A2F
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralProjectionType.A2F</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Air wavelength - Frequency</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralProjectionType.A2W"></a>A2W
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralProjectionType.A2W</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Air wavelength - Wavelength</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralProjectionType.A2V"></a>A2V
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralProjectionType.A2V</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Air wavelength - Apparent radial velocity</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralProjectionType.LOG"></a>LOG
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralProjectionType.LOG</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Logarithm</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralProjectionType.GRI"></a>GRI
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralProjectionType.GRI</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Grism</td>
+      </tr>
+      <tr>
+        <td class="feature-detail" rowspan="2" valign="top"><a name="SpectralProjectionType.GRA"></a>GRA
+        </td>
+        <td class="feature-heading">vodml-id</td>
+        <td class="feature-detail">SpectralProjectionType.GRA</td>
+      </tr>
+      <tr>
+        <td class="feature-heading">description</td>
+        <td class="feature-detail">Grism in air</td>
+      </tr>
+    </table><br><h3><a name="StringEntry"></a>2.1.21 objectType: StringEntry
     </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">TStringEntry</td>
+          <td class="objecttype-name" colspan="1">StringEntry</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">A 1-Dimensional discrete mapping of an integer counter to a corresponding string form.  A simple use case example is to transform
+            a pixel index value to a particular Polarization state represented as a string. 
           </td>
         </tr>
         <tr>
@@ -1182,7 +1996,7 @@
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#TLookupEntry">TLookupEntry [trans:TLookupEntry]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#LookupEntry">LookupEntry [trans:LookupEntry]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -1193,13 +2007,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="TStringEntry.nativeValue"></a><b>nativeValue</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="StringEntry.nativeValue"></a><b>nativeValue</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/vo-dml/IVOA-v1.0.html#integer">integer</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">TStringEntry.nativeValue</td>
+                      <td class="feature-detail">StringEntry.nativeValue</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1207,19 +2021,16 @@
                     </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">The native, or reference, value of the lookup entry.</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="TStringEntry.targetValue"></a><b>targetValue</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="StringEntry.targetValue"></a><b>targetValue</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/vo-dml/IVOA-v1.0.html#string">string</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">TStringEntry.targetValue</td>
+                      <td class="feature-detail">StringEntry.targetValue</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1227,9 +2038,75 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
+                      <td class="feature-detail">The target, or resulting, value of the lookup entry.</td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="TComplexOperation"></a>2.1.22 objectType: TComplexOperation
+    </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">TComplexOperation</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">Abstract class to facilitate the combination of Operations in various ways.</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">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#TOperation">TOperation [trans:TOperation]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="info-title" width="20%">abstract</td>
+                      <td class="feature-detail" colspan="3">True</td>
+                    </tr>
+                    <tr>
+                      <td class="info-title" width="20%">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#TJoin">TJoin</a> <a href="#Transform">Transform</a> 
+                      </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="TComplexOperation.map"></a><b>map</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#TOperation">TOperation [trans:TOperation]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">TComplexOperation.map</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">Components of the complex operation.  Depending on how the operations are combined, the interpretation of the components will
+                        change.
                       </td>
                     </tr>
                   </table>
@@ -1239,7 +2116,76 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="Transform"></a>2.1.12 objectType: Transform
+    </div><br><h3><a name="TJoin"></a>2.1.23 objectType: TJoin
+    </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">TJoin</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">Combines operations in parallel.  This class enables the building of an operation which covers the full dimension space of
+            the input.  Axes are distributed to the  component operations in order.  For example, to perform a shift on a 2-dimensional
+            coordinate (x,y), one would join two Shift operations giving the offset in x and y respectively.   Since this class is an
+            operation itself, it can be used as a component in other complex operations.
+          </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">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#TComplexOperation">TComplexOperation [trans:TComplexOperation]</a></td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="TOperation"></a>2.1.24 objectType: TOperation
+    </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">TOperation</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">Transform Operation (TOperation) defines a mathematical operation to be performed on its inputs.  These operations form the
+            building blocks with which complex operations can be defined.
+          </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" width="20%">abstract</td>
+                      <td class="feature-detail" colspan="3">True</td>
+                    </tr>
+                    <tr>
+                      <td class="info-title" width="20%">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#Lookup">Lookup</a> <a href="#Matrix">Matrix</a> <a href="#Polynomial">Polynomial</a> <a href="#Reorder">Reorder</a> <a href="#Rotate">Rotate</a> <a href="#Scale">Scale</a> <a href="#Shift">Shift</a> <a href="#TComplexOperation">TComplexOperation</a> <a href="#Unit">Unit</a> <a href="#WCSProjection">WCSProjection</a> 
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="Transform"></a>2.1.25 objectType: Transform
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -1249,8 +2195,69 @@
         </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">Typically the head of the transformation process, the Transform is a complex operation which executes the component maps in
+            sequence.  
+            This allows the building of multi-stage transforms such as a Matrix operation followed by a WCS Projection.
+          </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">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#TComplexOperation">TComplexOperation [trans:TComplexOperation]</a></td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="Unit"></a>2.1.26 objectType: Unit
+    </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">Unit</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">The Unit transform is an n-Dimensional operation which makes no change to the inputs. ( X' = X )</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">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#TOperation">TOperation [trans:TOperation]</a></td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="WCSProjection"></a>2.1.27 objectType: WCSProjection
+    </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">WCSProjection</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">Abstract head of World Coordinate System (WCS) projection operations.  We do not attempt to define the projections here, but
+            instead, provide extensions which support the transforms described in the FITS WCS papers II and III.
             
           </td>
         </tr>
@@ -1261,6 +2268,19 @@
                 <td colspan="2" bgcolor="#cacaca">
                   <table width="100%" border="0" cellpadding="3" cellspacing="1">
                     <tr>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#TOperation">TOperation [trans:TOperation]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="info-title" width="20%">abstract</td>
+                      <td class="feature-detail" colspan="3">True</td>
+                    </tr>
+                    <tr>
+                      <td class="info-title" width="20%">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#SkyProjection">SkyProjection</a> <a href="#SpectralProjection">SpectralProjection</a> 
+                      </td>
+                    </tr>
+                    <tr>
                       <td colspan="3" class="info-title">compositions</td>
                     </tr>
                     <tr>
@@ -1269,17 +2289,17 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="5"><a name="Transform.operation"></a><b>operation</b></td>
+                      <td class="feature-detail" valign="top" rowspan="5"><a name="WCSProjection.param"></a><b>param</b></td>
                       <td class="feature-heading">type</td>
-                      <td class="feature-detail"><a href="#TOperation">TOperation [trans:TOperation]</a></td>
+                      <td class="feature-detail"><a href="#ProjectionParam">ProjectionParam [trans:ProjectionParam]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">Transform.operation</td>
+                      <td class="feature-detail">WCSProjection.param</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
-                      <td class="feature-detail">1..*</td>
+                      <td class="feature-detail">0..*</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">isOrdered</td>
@@ -1287,9 +2307,9 @@
                     </tr>
                     <tr>
                       <td class="feature-heading">description</td>
-                      <td class="feature-detail">
-                        TODO : Missing description : please, update your UML model asap.
-                        
+                      <td class="feature-detail">Set of 0 or more parameters providing supplemental metadata required to execute a particular projection algorithm.  The number
+                        and meaning of the parameters depends on the algorithm.  They are typically in the from of "PVi_j" keyword/value pairs, so
+                        we provide a simple ProjectionParam element to accommodate these.  The detailed content specification is left to the WCS paper.
                       </td>
                     </tr>
                   </table>
@@ -1315,425 +2335,614 @@
       <tr>
         <td class="feature-detail"><a href="#"></a></td>
         <td class="feature-detail">vo-dml:model</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
+        <td class="feature-detail">The transform model defines mathematical operations which can be combined in parallel and/or in series, to form complex transformation
+          expressions.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Mappings">Mappings</a></td>
+        <td class="feature-detail"><a href="#Lookup">Lookup</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">Defines a lookup table operation.  The Lookup is comprised of a series of value pairs (LookupEntry).  All members of the series
+          MUST be of the same type.
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Mappings.transforms">Mappings.transforms</a></td>
+        <td class="feature-detail"><a href="#Lookup.entry">Lookup.entry</a></td>
         <td class="feature-detail">composition</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
+        <td class="feature-detail">Set of lookup table entries forming a discrete mapping from the native space to the target space.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#LookupEntry">LookupEntry</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">This is an abstract head of lookup table entry objects.  Each entry provides a discrete translation of a 'native' value to
+          the corresponding 'target' value. 
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection">Projection</a></td>
-        <td class="feature-detail">enumeration</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
+        <td class="feature-detail"><a href="#Matrix">Matrix</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">An M x N matrix operation.  Each cell of the matrix is provided by a MatrixElement object.  Missing elements should be considerd
+          to equal 0. 
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.AIR">Projection.AIR</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
+        <td class="feature-detail"><a href="#Matrix.M">Matrix.M</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">Number of rows in the matrix.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Matrix.N">Matrix.N</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">Number of columns in the matrix.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Matrix.element">Matrix.element</a></td>
+        <td class="feature-detail">composition</td>
+        <td class="feature-detail">Collection of MatrixElements which define each cell of the matrix.  The total number of elements MUST NOT exceed M*N, any
+          missing elements result a cell with value=0.0.
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.AIT">Projection.AIT</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
+        <td class="feature-detail"><a href="#MatrixElement">MatrixElement</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">The value of cell m,n in an M x N matrix.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#MatrixElement.m">MatrixElement.m</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">Matrix cell row number.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#MatrixElement.n">MatrixElement.n</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">Matrix cell column number.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#MatrixElement.value">MatrixElement.value</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">Matrix cell value.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#NumericEntry">NumericEntry</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">A 1-Dimensional discrete mapping of numeric values. </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#NumericEntry.nativeValue">NumericEntry.nativeValue</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">The native, or reference, value of the lookup entry.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#NumericEntry.targetValue">NumericEntry.targetValue</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">The target, or resulting, value of the lookup entry.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#PolyCoeff1D">PolyCoeff1D</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">A term of the polynomial expression.  This object provides the coefficient (c) and power (p) of the term, forming the expression
+          c*X**p.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.ARC">Projection.ARC</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
+        <td class="feature-detail"><a href="#PolyCoeff1D.coeff">PolyCoeff1D.coeff</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">Multiplicitive coefficient of the term.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#PolyCoeff1D.power">PolyCoeff1D.power</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">The power to raise the value for this term.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#PolyCoeff2D">PolyCoeff2D</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">A term of the polynomial expression.  This object provides the coefficient (c) and power (p) of the term, forming the expression
+          c*X**p.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.BON">Projection.BON</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
+        <td class="feature-detail"><a href="#PolyCoeff2D.coeff">PolyCoeff2D.coeff</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">Multiplicitive coefficient of the term.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#PolyCoeff2D.power">PolyCoeff2D.power</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">The power to raise the values for this term in each dimension.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Polynomial">Polynomial</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">Abstract head of a family of Polynomial distortion operations.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Polynomial.order">Polynomial.order</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">The order, or degree, of the polynomial expression.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Polynomial1D">Polynomial1D</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">A 1-Dimensional Polynomial transform represented by the expression:  X' = SUM( Ci*X**Pi),  i=0..order.  Each term is provided
+          by a PolyCoeff1D object.  Missing terms are considered to have a coefficient of 0.0.
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.CAR">Projection.CAR</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
+        <td class="feature-detail"><a href="#Polynomial1D.term">Polynomial1D.term</a></td>
+        <td class="feature-detail">composition</td>
+        <td class="feature-detail">A term in the polynomial expression.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Polynomial2D">Polynomial2D</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">A 2-Dimensional Polynomial transform represented by the expression:  X' = SUMi,j( Cij*X**P1i*Y**P2j),  i=0..order, j=0..order.
+          Each term is provided by a PolyCoeff2D object.  Missing terms are considered to have a coefficient of 0.0.
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.CEA">Projection.CEA</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
+        <td class="feature-detail"><a href="#Polynomial2D.term">Polynomial2D.term</a></td>
+        <td class="feature-detail">composition</td>
+        <td class="feature-detail">A term in the polynomial expression.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#ProjectionParam">ProjectionParam</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">Simple parameter specification for WCS Projections.  The parameter is modeled as a simple name/value pair.  The details of
+          expectations for the various projection algorithms is left to the WCS paper describing the algorithm.
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.COD">Projection.COD</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
+        <td class="feature-detail"><a href="#ProjectionParam.name">ProjectionParam.name</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">The parameter name.  This is typically, but not always, given as a "PVi_j" key.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#ProjectionParam.value">ProjectionParam.value</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">The value for the parameter. </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Reorder">Reorder</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">This operation facilitates the specification of axis order shuffling between operations.  For example, if we have a 3-dimensional
+          coordinate (x,y,z) and wish to perform a 2-dimensional transform on the (x,z) plane, this operation, joined, allows us to
+          define a new axis order  (y,x,z) to feed into the next step ( 1D + 2D operations).
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.COE">Projection.COE</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
+        <td class="feature-detail"><a href="#Reorder.in">Reorder.in</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">The input (original) axis/dimension number.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Reorder.out">Reorder.out</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">The output (target) axis/dimension number.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Rotate">Rotate</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">A 2-Dimensional rotation operation.  </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Rotate.angle">Rotate.angle</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">Rotation angle in degrees, applied in counter-clockwise direction.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Scale">Scale</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">A 1-Dimensional operator for simple scaling. ( X' = factor*X )</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Scale.factor">Scale.factor</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">The scale factor.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Shift">Shift</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">A 1-Dimensional operation defining a simple offset.  ( X' = X + shift )</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#Shift.shift">Shift.shift</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">The amount of offset to apply.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SkyProjection">SkyProjection</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">This class represents a two-dimensional projection of sky as detailed in the FITS WCS paper II.  As in the paper, this operation
+          picks up from the intermediate coordinate system, AFTER the application of the linear transform from pixel to intermediate
+          space.  In this model, the full transform from pixel to world is accomplished with a two-stage Transform, first applying the
+          linear operations via a Matrix or other component operations, followed by the SkyProjection operation.
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.COO">Projection.COO</a></td>
-        <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
+        <td class="feature-detail"><a href="#SkyProjection.algorithm">SkyProjection.algorithm</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">The projection algorithm to apply.  The value MUST be taken from the enumeration of standard sky projection algorithms.  Extracted
+          from 'ctype' in the FITS WCS representations.
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.CSC">Projection.CSC</a></td>
+        <td class="feature-detail"><a href="#SkyProjection.referenceValue">SkyProjection.referenceValue</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">The target reference values in each dimension.  Equivalent to 'crval' in FITS WCS representations.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SkyProjectionType">SkyProjectionType</a></td>
+        <td class="feature-detail">enumeration</td>
+        <td class="feature-detail">Enumeration of non-linear celestial projection algorithm codes as listed in Table 13 of the FITS WCS paper II.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SkyProjectionType.AIR">SkyProjectionType.AIR</a></td>
         <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">Airy</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.LOG">Projection.LOG</a></td>
+        <td class="feature-detail"><a href="#SkyProjectionType.AIT">SkyProjectionType.AIT</a></td>
         <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">Hammer-Aitoff</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.MER">Projection.MER</a></td>
+        <td class="feature-detail"><a href="#SkyProjectionType.ARC">SkyProjectionType.ARC</a></td>
         <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">Zenithal equidistant</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.MOL">Projection.MOL</a></td>
+        <td class="feature-detail"><a href="#SkyProjectionType.AZP">SkyProjectionType.AZP</a></td>
         <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">Zenithal perspective</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.PAR">Projection.PAR</a></td>
+        <td class="feature-detail"><a href="#SkyProjectionType.BON">SkyProjectionType.BON</a></td>
         <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">Bonne equal-area</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.PCO">Projection.PCO</a></td>
+        <td class="feature-detail"><a href="#SkyProjectionType.CAR">SkyProjectionType.CAR</a></td>
         <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">Plate carree</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.QSC">Projection.QSC</a></td>
+        <td class="feature-detail"><a href="#SkyProjectionType.CEA">SkyProjectionType.CEA</a></td>
         <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">Cylindrical equal-area</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.SFL">Projection.SFL</a></td>
+        <td class="feature-detail"><a href="#SkyProjectionType.COD">SkyProjectionType.COD</a></td>
         <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">Conic equidistant</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.SIN">Projection.SIN</a></td>
+        <td class="feature-detail"><a href="#SkyProjectionType.COE">SkyProjectionType.COE</a></td>
         <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">Conic equal-area</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.STG">Projection.STG</a></td>
+        <td class="feature-detail"><a href="#SkyProjectionType.COO">SkyProjectionType.COO</a></td>
         <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">Conic orthomorphic</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.TAN">Projection.TAN</a></td>
+        <td class="feature-detail"><a href="#SkyProjectionType.COP">SkyProjectionType.COP</a></td>
         <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">Conic perspective</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.TSC">Projection.TSC</a></td>
+        <td class="feature-detail"><a href="#SkyProjectionType.CSC">SkyProjectionType.CSC</a></td>
         <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">COBE Quadrilateralized spherical cube</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Projection.ZEA">Projection.ZEA</a></td>
+        <td class="feature-detail"><a href="#SkyProjectionType.CYP">SkyProjectionType.CYP</a></td>
         <td class="feature-detail">literal</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">Cylindrical perspective</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TLookup">TLookup</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail"><a href="#SkyProjectionType.MER">SkyProjectionType.MER</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Mercator</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TLookup.entry">TLookup.entry</a></td>
-        <td class="feature-detail">composition</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail"><a href="#SkyProjectionType.MOL">SkyProjectionType.MOL</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Mollweide</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TLookupEntry">TLookupEntry</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail"><a href="#SkyProjectionType.PAR">SkyProjectionType.PAR</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Parabolic</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TMatrix">TMatrix</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail"><a href="#SkyProjectionType.PCO">SkyProjectionType.PCO</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Polyconic</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TMatrix.M">TMatrix.M</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail"><a href="#SkyProjectionType.QSC">SkyProjectionType.QSC</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Quadrilateralized spherical cube</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TMatrix.N">TMatrix.N</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail"><a href="#SkyProjectionType.SFL">SkyProjectionType.SFL</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Sanson-Flamsteed</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TMatrix.element">TMatrix.element</a></td>
-        <td class="feature-detail">composition</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail"><a href="#SkyProjectionType.SIN">SkyProjectionType.SIN</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Slant orthographic (Sine projection)</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SkyProjectionType.STG">SkyProjectionType.STG</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Stereographic</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SkyProjectionType.SZP">SkyProjectionType.SZP</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Slant zenithal perspective</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TMatrixElement">TMatrixElement</a></td>
+        <td class="feature-detail"><a href="#SkyProjectionType.TAN">SkyProjectionType.TAN</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Gnomonic (Tangent plane projection)</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SkyProjectionType.TSC">SkyProjectionType.TSC</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Tangential spherical cube</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SkyProjectionType.ZEA">SkyProjectionType.ZEA</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Zenethal equal-area</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SkyProjectionType.ZPN">SkyProjectionType.ZPN</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Zenithal polynomial</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralCoordType">SpectralCoordType</a></td>
+        <td class="feature-detail">enumeration</td>
+        <td class="feature-detail">Enumeration of spectral coordinate types as listed in Table 1 of the FITS WCS paper III.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralCoordType.AWAV">SpectralCoordType.AWAV</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Air wavelength</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralCoordType.BETA">SpectralCoordType.BETA</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Beta factor (v/c)</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralCoordType.ENER">SpectralCoordType.ENER</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Energy</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralCoordType.FREQ">SpectralCoordType.FREQ</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Frequency</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralCoordType.VELO">SpectralCoordType.VELO</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Apparent radial velocity</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralCoordType.VOPT">SpectralCoordType.VOPT</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Optical velocity</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralCoordType.VRAD">SpectralCoordType.VRAD</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Radio velocity</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralCoordType.WAVE">SpectralCoordType.WAVE</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Vacuum wavelength</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralCoordType.WAVN">SpectralCoordType.WAVN</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Wavenumber</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralCoordType.ZOPT">SpectralCoordType.ZOPT</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Redshift</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralProjection">SpectralProjection</a></td>
         <td class="feature-detail">objectType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">This class represents a nonlinear one-dimensional spectral transform as detailed in the FITS WCS paper III.</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TMatrixElement.m">TMatrixElement.m</a></td>
+        <td class="feature-detail"><a href="#SpectralProjection.algorithm">SpectralProjection.algorithm</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">The projection algorithm to apply.  The value MUST be taken from the enumeration of non-linear spectral projection algorithms.
+          Extracted from 'ctype' in FITS WCS representations.
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TMatrixElement.n">TMatrixElement.n</a></td>
+        <td class="feature-detail"><a href="#SpectralProjection.coordType">SpectralProjection.coordType</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">The resulting spectral coordinate type code.  Values MUST be taken from the enumerated list of spectral coordinate types.
+          Extracted from 'ctype' in FITS WCS representations.
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TMatrixElement.value">TMatrixElement.value</a></td>
+        <td class="feature-detail"><a href="#SpectralProjection.referenceValue">SpectralProjection.referenceValue</a></td>
         <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">The target reference value for the axis.  Equivalent to 'crval' in FITS WCS representations.</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TNumericEntry">TNumericEntry</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"><a href="#SpectralProjectionType">SpectralProjectionType</a></td>
+        <td class="feature-detail">enumeration</td>
+        <td class="feature-detail">Enumeration of non-linear spectral projection algorithm codes as listed in Table 2 of the FITS WCS paper III.
+          NOTE: We exclude the TAB code from this list, that type is handled by the Lookup operation in this model.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TNumericEntry.nativeValue">TNumericEntry.nativeValue</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail"><a href="#SpectralProjectionType.A2F">SpectralProjectionType.A2F</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Air wavelength - Frequency</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TNumericEntry.targetValue">TNumericEntry.targetValue</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail"><a href="#SpectralProjectionType.A2V">SpectralProjectionType.A2V</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Air wavelength - Apparent radial velocity</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TOperation">TOperation</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail"><a href="#SpectralProjectionType.A2W">SpectralProjectionType.A2W</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Air wavelength - Wavelength</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TProjection">TProjection</a></td>
-        <td class="feature-detail">objectType</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail"><a href="#SpectralProjectionType.F2A">SpectralProjectionType.F2A</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Frequency - Air wavelength</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TProjection.algorithm">TProjection.algorithm</a></td>
-        <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail"><a href="#SpectralProjectionType.F2V">SpectralProjectionType.F2V</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Frequency - Apparent radial velocity</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TProjection.axis">TProjection.axis</a></td>
-        <td class="feature-detail">composition</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail"><a href="#SpectralProjectionType.F2W">SpectralProjectionType.F2W</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Frequency - Wavelength</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TProjectionAxis">TProjectionAxis</a></td>
+        <td class="feature-detail"><a href="#SpectralProjectionType.GRA">SpectralProjectionType.GRA</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Grism in air</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralProjectionType.GRI">SpectralProjectionType.GRI</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Grism</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralProjectionType.LOG">SpectralProjectionType.LOG</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Logarithm</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralProjectionType.V2A">SpectralProjectionType.V2A</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Apparent radial velocity - Air wavelength</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralProjectionType.V2F">SpectralProjectionType.V2F</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Apparent radial velocity - Frequency</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralProjectionType.V2W">SpectralProjectionType.V2W</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Apparent radial velocity - Wavelength</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralProjectionType.W2A">SpectralProjectionType.W2A</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Wavelength - Air wavelength</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralProjectionType.W2F">SpectralProjectionType.W2F</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Wavelength - Frequency</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#SpectralProjectionType.W2V">SpectralProjectionType.W2V</a></td>
+        <td class="feature-detail">literal</td>
+        <td class="feature-detail">Wavelength - Apparent radial velocity</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#StringEntry">StringEntry</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">A 1-Dimensional discrete mapping of an integer counter to a corresponding string form.  A simple use case example is to transform
+          a pixel index value to a particular Polarization state represented as a string. 
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TProjectionAxis.nativeRefValue">TProjectionAxis.nativeRefValue</a></td>
+        <td class="feature-detail"><a href="#StringEntry.nativeValue">StringEntry.nativeValue</a></td>
         <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">The native, or reference, value of the lookup entry.</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TProjectionAxis.scale">TProjectionAxis.scale</a></td>
+        <td class="feature-detail"><a href="#StringEntry.targetValue">StringEntry.targetValue</a></td>
         <td class="feature-detail">attribute</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
+        <td class="feature-detail">The target, or resulting, value of the lookup entry.</td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TProjectionAxis.targetRefValue">TProjectionAxis.targetRefValue</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="#TComplexOperation">TComplexOperation</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">Abstract class to facilitate the combination of Operations in various ways.</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#TComplexOperation.map">TComplexOperation.map</a></td>
+        <td class="feature-detail">composition</td>
+        <td class="feature-detail">Components of the complex operation.  Depending on how the operations are combined, the interpretation of the components will
+          change.
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TStringEntry">TStringEntry</a></td>
+        <td class="feature-detail"><a href="#TJoin">TJoin</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">Combines operations in parallel.  This class enables the building of an operation which covers the full dimension space of
+          the input.  Axes are distributed to the  component operations in order.  For example, to perform a shift on a 2-dimensional
+          coordinate (x,y), one would join two Shift operations giving the offset in x and y respectively.   Since this class is an
+          operation itself, it can be used as a component in other complex operations.
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TStringEntry.nativeValue">TStringEntry.nativeValue</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="#TOperation">TOperation</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">Transform Operation (TOperation) defines a mathematical operation to be performed on its inputs.  These operations form the
+          building blocks with which complex operations can be defined.
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#TStringEntry.targetValue">TStringEntry.targetValue</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="#Transform">Transform</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">Typically the head of the transformation process, the Transform is a complex operation which executes the component maps in
+          sequence.  
+          This allows the building of multi-stage transforms such as a Matrix operation followed by a WCS Projection.
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Transform">Transform</a></td>
+        <td class="feature-detail"><a href="#Unit">Unit</a></td>
+        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">The Unit transform is an n-Dimensional operation which makes no change to the inputs. ( X' = X )</td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#WCSProjection">WCSProjection</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">Abstract head of World Coordinate System (WCS) projection operations.  We do not attempt to define the projections here, but
+          instead, provide extensions which support the transforms described in the FITS WCS papers II and III.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#Transform.operation">Transform.operation</a></td>
+        <td class="feature-detail"><a href="#WCSProjection.param">WCSProjection.param</a></td>
         <td class="feature-detail">composition</td>
-        <td class="feature-detail">
-          TODO : Missing description : please, update your UML model asap.
-          
+        <td class="feature-detail">Set of 0 or more parameters providing supplemental metadata required to execute a particular projection algorithm.  The number
+          and meaning of the parameters depends on the algorithm.  They are typically in the from of "PVi_j" keyword/value pairs, so
+          we provide a simple ProjectionParam element to accommodate these.  The detailed content specification is left to the WCS paper.
         </td>
       </tr>
     </table>
@@ -1752,7 +2961,7 @@
       </tr>
       <tr>
         <td width="30%" class="info-title">url</td>
-        <td><a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/vo-dml/IVOA-v1.0.vo-dml.xml">http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/vo-dml/IVOA-v1.0.vo-dml.xml</a></td>
+        <td><a href="http://www.ivoa.net/xml/VODML/20180519/IVOA-v1.0.vo-dml.xml">http://www.ivoa.net/xml/VODML/20180519/IVOA-v1.0.vo-dml.xml</a></td>
       </tr>
       <tr>
         <td width="30%" class="info-title">documentation url</td>

Modified: trunk/projects/dm/STC/Trans/vo-dml/STC_trans-v1.0.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/projects/dm/STC/Trans/vo-dml/STC_trans-v1.0.vo-dml.xml
==============================================================================
--- trunk/projects/dm/STC/Trans/vo-dml/STC_trans-v1.0.vo-dml.xml	Wed Dec 12 11:05:05 2018	(r5273)
+++ trunk/projects/dm/STC/Trans/vo-dml/STC_trans-v1.0.vo-dml.xml	Wed Dec 12 16:44:17 2018	(r5274)
@@ -3,265 +3,449 @@
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="http://www.ivoa.net/xml/VODML/v1 file:///data/vao/staff/mcd/docs/models/dm/vo-dml/xsd/vo-dml-v1.xsd">
   <name>trans</name>
-  <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+  <description>The transform model defines mathematical operations which can be combined in parallel and/or in series, to form complex transformation expressions.
+</description>
   <uri/>
-  <title>STC2 Transform Model</title>
+  <title>WCS Transform Model</title>
   <author>Arnold Rots, Mark Cresitello-Dittmar</author>
-  <version>2.0</version>
-  <previousVersion>0.x</previousVersion>
-  <lastModified>2018-05-03T16:02:15</lastModified>
+  <version>1.0</version>
+  <previousVersion>0.0</previousVersion>
+  <lastModified>2018-12-11T16:48:52</lastModified>
   <import>
     <name>ivoa</name>
-    <url>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/vo-dml/IVOA-v1.0.vo-dml.xml</url>
+    <url>http://www.ivoa.net/xml/VODML/20180519/IVOA-v1.0.vo-dml.xml</url>
     <documentationURL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/vo-dml/IVOA-v1.0.html</documentationURL>
   </import>
   <enumeration>
-    <vodml-id>Projection</vodml-id>
-    <name>Projection</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+    <vodml-id>SkyProjectionType</vodml-id>
+    <name>SkyProjectionType</name>
+    <description>Enumeration of non-linear celestial projection algorithm codes as listed in Table 13 of the FITS WCS paper II.</description>
     <literal>
-      <vodml-id>Projection.LOG</vodml-id>
-      <name>LOG</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <vodml-id>SkyProjectionType.AZP</vodml-id>
+      <name>AZP</name>
+      <description>Zenithal perspective</description>
     </literal>
     <literal>
-      <vodml-id>Projection.TAN</vodml-id>
-      <name>TAN</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <vodml-id>SkyProjectionType.SZP</vodml-id>
+      <name>SZP</name>
+      <description>Slant zenithal perspective</description>
     </literal>
     <literal>
-      <vodml-id>Projection.SIN</vodml-id>
-      <name>SIN</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <vodml-id>SkyProjectionType.TAN</vodml-id>
+      <name>TAN</name>
+      <description>Gnomonic (Tangent plane projection)</description>
     </literal>
     <literal>
-      <vodml-id>Projection.STG</vodml-id>
+      <vodml-id>SkyProjectionType.STG</vodml-id>
       <name>STG</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Stereographic</description>
+    </literal>
+    <literal>
+      <vodml-id>SkyProjectionType.SIN</vodml-id>
+      <name>SIN</name>
+      <description>Slant orthographic (Sine projection)</description>
     </literal>
     <literal>
-      <vodml-id>Projection.ARC</vodml-id>
+      <vodml-id>SkyProjectionType.ARC</vodml-id>
       <name>ARC</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Zenithal equidistant</description>
     </literal>
     <literal>
-      <vodml-id>Projection.ZEA</vodml-id>
+      <vodml-id>SkyProjectionType.ZPN</vodml-id>
+      <name>ZPN</name>
+      <description>Zenithal polynomial</description>
+    </literal>
+    <literal>
+      <vodml-id>SkyProjectionType.ZEA</vodml-id>
       <name>ZEA</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Zenethal equal-area</description>
     </literal>
     <literal>
-      <vodml-id>Projection.AIR</vodml-id>
+      <vodml-id>SkyProjectionType.AIR</vodml-id>
       <name>AIR</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Airy</description>
+    </literal>
+    <literal>
+      <vodml-id>SkyProjectionType.CYP</vodml-id>
+      <name>CYP</name>
+      <description>Cylindrical perspective</description>
     </literal>
     <literal>
-      <vodml-id>Projection.CEA</vodml-id>
+      <vodml-id>SkyProjectionType.CEA</vodml-id>
       <name>CEA</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Cylindrical equal-area</description>
     </literal>
     <literal>
-      <vodml-id>Projection.CAR</vodml-id>
+      <vodml-id>SkyProjectionType.CAR</vodml-id>
       <name>CAR</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Plate carree</description>
     </literal>
     <literal>
-      <vodml-id>Projection.MER</vodml-id>
+      <vodml-id>SkyProjectionType.MER</vodml-id>
       <name>MER</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Mercator</description>
     </literal>
     <literal>
-      <vodml-id>Projection.SFL</vodml-id>
+      <vodml-id>SkyProjectionType.SFL</vodml-id>
       <name>SFL</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Sanson-Flamsteed</description>
     </literal>
     <literal>
-      <vodml-id>Projection.PAR</vodml-id>
+      <vodml-id>SkyProjectionType.PAR</vodml-id>
       <name>PAR</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Parabolic</description>
     </literal>
     <literal>
-      <vodml-id>Projection.MOL</vodml-id>
+      <vodml-id>SkyProjectionType.MOL</vodml-id>
       <name>MOL</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Mollweide</description>
     </literal>
     <literal>
-      <vodml-id>Projection.AIT</vodml-id>
+      <vodml-id>SkyProjectionType.AIT</vodml-id>
       <name>AIT</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Hammer-Aitoff</description>
+    </literal>
+    <literal>
+      <vodml-id>SkyProjectionType.COP</vodml-id>
+      <name>COP</name>
+      <description>Conic perspective</description>
     </literal>
     <literal>
-      <vodml-id>Projection.COE</vodml-id>
+      <vodml-id>SkyProjectionType.COE</vodml-id>
       <name>COE</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Conic equal-area</description>
     </literal>
     <literal>
-      <vodml-id>Projection.COD</vodml-id>
+      <vodml-id>SkyProjectionType.COD</vodml-id>
       <name>COD</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Conic equidistant</description>
     </literal>
     <literal>
-      <vodml-id>Projection.COO</vodml-id>
+      <vodml-id>SkyProjectionType.COO</vodml-id>
       <name>COO</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Conic orthomorphic</description>
     </literal>
     <literal>
-      <vodml-id>Projection.BON</vodml-id>
+      <vodml-id>SkyProjectionType.BON</vodml-id>
       <name>BON</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Bonne equal-area</description>
     </literal>
     <literal>
-      <vodml-id>Projection.PCO</vodml-id>
+      <vodml-id>SkyProjectionType.PCO</vodml-id>
       <name>PCO</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Polyconic</description>
     </literal>
     <literal>
-      <vodml-id>Projection.TSC</vodml-id>
+      <vodml-id>SkyProjectionType.TSC</vodml-id>
       <name>TSC</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Tangential spherical cube</description>
     </literal>
     <literal>
-      <vodml-id>Projection.CSC</vodml-id>
+      <vodml-id>SkyProjectionType.CSC</vodml-id>
       <name>CSC</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>COBE Quadrilateralized spherical cube</description>
     </literal>
     <literal>
-      <vodml-id>Projection.QSC</vodml-id>
+      <vodml-id>SkyProjectionType.QSC</vodml-id>
       <name>QSC</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Quadrilateralized spherical cube</description>
+    </literal>
+  </enumeration>
+
+  <enumeration>
+    <vodml-id>SpectralProjectionType</vodml-id>
+    <name>SpectralProjectionType</name>
+    <description>Enumeration of non-linear spectral projection algorithm codes as listed in Table 2 of the FITS WCS paper III.
+NOTE: We exclude the TAB code from this list, that type is handled by the Lookup operation in this model.
+</description>
+    <literal>
+      <vodml-id>SpectralProjectionType.F2W</vodml-id>
+      <name>F2W</name>
+      <description>Frequency - Wavelength</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralProjectionType.F2V</vodml-id>
+      <name>F2V</name>
+      <description>Frequency - Apparent radial velocity</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralProjectionType.F2A</vodml-id>
+      <name>F2A</name>
+      <description>Frequency - Air wavelength</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralProjectionType.W2F</vodml-id>
+      <name>W2F</name>
+      <description>Wavelength - Frequency</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralProjectionType.W2V</vodml-id>
+      <name>W2V</name>
+      <description>Wavelength - Apparent radial velocity</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralProjectionType.W2A</vodml-id>
+      <name>W2A</name>
+      <description>Wavelength - Air wavelength</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralProjectionType.V2F</vodml-id>
+      <name>V2F</name>
+      <description>Apparent radial velocity - Frequency</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralProjectionType.V2W</vodml-id>
+      <name>V2W</name>
+      <description>Apparent radial velocity - Wavelength</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralProjectionType.V2A</vodml-id>
+      <name>V2A</name>
+      <description>Apparent radial velocity - Air wavelength</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralProjectionType.A2F</vodml-id>
+      <name>A2F</name>
+      <description>Air wavelength - Frequency</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralProjectionType.A2W</vodml-id>
+      <name>A2W</name>
+      <description>Air wavelength - Wavelength</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralProjectionType.A2V</vodml-id>
+      <name>A2V</name>
+      <description>Air wavelength - Apparent radial velocity</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralProjectionType.LOG</vodml-id>
+      <name>LOG</name>
+      <description>Logarithm</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralProjectionType.GRI</vodml-id>
+      <name>GRI</name>
+      <description>Grism</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralProjectionType.GRA</vodml-id>
+      <name>GRA</name>
+      <description>Grism in air</description>
+    </literal>
+  </enumeration>
+
+  <enumeration>
+    <vodml-id>SpectralCoordType</vodml-id>
+    <name>SpectralCoordType</name>
+    <description>Enumeration of spectral coordinate types as listed in Table 1 of the FITS WCS paper III.</description>
+    <literal>
+      <vodml-id>SpectralCoordType.FREQ</vodml-id>
+      <name>FREQ</name>
+      <description>Frequency</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralCoordType.ENER</vodml-id>
+      <name>ENER</name>
+      <description>Energy</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralCoordType.WAVN</vodml-id>
+      <name>WAVN</name>
+      <description>Wavenumber</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralCoordType.VRAD</vodml-id>
+      <name>VRAD</name>
+      <description>Radio velocity</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralCoordType.WAVE</vodml-id>
+      <name>WAVE</name>
+      <description>Vacuum wavelength</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralCoordType.VOPT</vodml-id>
+      <name>VOPT</name>
+      <description>Optical velocity</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralCoordType.ZOPT</vodml-id>
+      <name>ZOPT</name>
+      <description>Redshift</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralCoordType.AWAV</vodml-id>
+      <name>AWAV</name>
+      <description>Air wavelength</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralCoordType.VELO</vodml-id>
+      <name>VELO</name>
+      <description>Apparent radial velocity</description>
+    </literal>
+    <literal>
+      <vodml-id>SpectralCoordType.BETA</vodml-id>
+      <name>BETA</name>
+      <description>Beta factor (v/c)</description>
     </literal>
   </enumeration>
 
   <objectType>
     <vodml-id>Transform</vodml-id>
     <name>Transform</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-    <composition>
-      <vodml-id>Transform.operation</vodml-id>
-      <name>operation</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+    <description>Typically the head of the transformation process, the Transform is a complex operation which executes the component maps in sequence.  
+This allows the building of multi-stage transforms such as a Matrix operation followed by a WCS Projection.</description>
+    <extends>
+      <vodml-ref>trans:TComplexOperation</vodml-ref>
+    </extends>
+  </objectType>
+
+  <objectType>
+    <vodml-id>TJoin</vodml-id>
+    <name>TJoin</name>
+    <description>Combines operations in parallel.  This class enables the building of an operation which covers the full dimension space of the input.  Axes are distributed to the  component operations in order.  For example, to perform a shift on a 2-dimensional coordinate (x,y), one would join two Shift operations giving the offset in x and y respectively.   Since this class is an operation itself, it can be used as a component in other complex operations.</description>
+    <extends>
+      <vodml-ref>trans:TComplexOperation</vodml-ref>
+    </extends>
+  </objectType>
+
+  <objectType abstract="true">
+    <vodml-id>TOperation</vodml-id>
+    <name>TOperation</name>
+    <description>Transform Operation (TOperation) defines a mathematical operation to be performed on its inputs.  These operations form the building blocks with which complex operations can be defined.</description>
+  </objectType>
+
+  <objectType>
+    <vodml-id>Unit</vodml-id>
+    <name>Unit</name>
+    <description>The Unit transform is an n-Dimensional operation which makes no change to the inputs. ( X' = X )</description>
+    <extends>
+      <vodml-ref>trans:TOperation</vodml-ref>
+    </extends>
+  </objectType>
+
+  <objectType>
+    <vodml-id>Shift</vodml-id>
+    <name>Shift</name>
+    <description>A 1-Dimensional operation defining a simple offset.  ( X' = X + shift )</description>
+    <extends>
+      <vodml-ref>trans:TOperation</vodml-ref>
+    </extends>
+    <attribute>
+      <vodml-id>Shift.shift</vodml-id>
+      <name>shift</name>
+      <description>The amount of offset to apply.</description>
       <datatype>
-        <vodml-ref>trans:TOperation</vodml-ref>
+        <vodml-ref>ivoa:real</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>1</minOccurs>
-        <maxOccurs>-1</maxOccurs>
+        <maxOccurs>1</maxOccurs>
       </multiplicity>
-    </composition>
+    </attribute>
   </objectType>
 
-  <objectType abstract="true">
-    <vodml-id>TOperation</vodml-id>
-    <name>TOperation</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+  <objectType>
+    <vodml-id>Scale</vodml-id>
+    <name>Scale</name>
+    <description>A 1-Dimensional operator for simple scaling. ( X' = factor*X )</description>
+    <extends>
+      <vodml-ref>trans:TOperation</vodml-ref>
+    </extends>
+    <attribute>
+      <vodml-id>Scale.factor</vodml-id>
+      <name>factor</name>
+      <description>The scale factor.</description>
+      <datatype>
+        <vodml-ref>ivoa:real</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
   </objectType>
 
   <objectType>
-    <vodml-id>TProjection</vodml-id>
-    <name>TProjection</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+    <vodml-id>Rotate</vodml-id>
+    <name>Rotate</name>
+    <description>A 2-Dimensional rotation operation.  </description>
     <extends>
       <vodml-ref>trans:TOperation</vodml-ref>
     </extends>
     <attribute>
-      <vodml-id>TProjection.algorithm</vodml-id>
-      <name>algorithm</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <vodml-id>Rotate.angle</vodml-id>
+      <name>angle</name>
+      <description>Rotation angle in degrees, applied in counter-clockwise direction.</description>
       <datatype>
-        <vodml-ref>trans:Projection</vodml-ref>
+        <vodml-ref>ivoa:real</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>1</minOccurs>
         <maxOccurs>1</maxOccurs>
       </multiplicity>
     </attribute>
-    <composition>
-      <vodml-id>TProjection.axis</vodml-id>
-      <name>axis</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+  </objectType>
+
+  <objectType>
+    <vodml-id>Matrix</vodml-id>
+    <name>Matrix</name>
+    <description>An M x N matrix operation.  Each cell of the matrix is provided by a MatrixElement object.  Missing elements should be considerd to equal 0. </description>
+    <extends>
+      <vodml-ref>trans:TOperation</vodml-ref>
+    </extends>
+    <constraint>
+      <description>Matrix.element[] maxlength = M*N</description>
+    </constraint>
+    <attribute>
+      <vodml-id>Matrix.M</vodml-id>
+      <name>M</name>
+      <description>Number of rows in the matrix.</description>
       <datatype>
-        <vodml-ref>trans:TProjectionAxis</vodml-ref>
+        <vodml-ref>ivoa:nonnegativeInteger</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>1</minOccurs>
-        <maxOccurs>2</maxOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
+    <attribute>
+      <vodml-id>Matrix.N</vodml-id>
+      <name>N</name>
+      <description>Number of columns in the matrix.</description>
+      <datatype>
+        <vodml-ref>ivoa:nonnegativeInteger</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
+    <composition>
+      <vodml-id>Matrix.element</vodml-id>
+      <name>element</name>
+      <description>Collection of MatrixElements which define each cell of the matrix.  The total number of elements MUST NOT exceed M*N, any missing elements result a cell with value=0.0.</description>
+      <datatype>
+        <vodml-ref>trans:MatrixElement</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>0</minOccurs>
+        <maxOccurs>-1</maxOccurs>
       </multiplicity>
     </composition>
   </objectType>
 
   <objectType>
-    <vodml-id>TProjectionAxis</vodml-id>
-    <name>TProjectionAxis</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+    <vodml-id>MatrixElement</vodml-id>
+    <name>MatrixElement</name>
+    <description>The value of cell m,n in an M x N matrix.</description>
     <attribute>
-      <vodml-id>TProjectionAxis.nativeRefValue</vodml-id>
-      <name>nativeRefValue</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <vodml-id>MatrixElement.m</vodml-id>
+      <name>m</name>
+      <description>Matrix cell row number.</description>
       <datatype>
-        <vodml-ref>ivoa:real</vodml-ref>
+        <vodml-ref>ivoa:nonnegativeInteger</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>1</minOccurs>
@@ -269,13 +453,11 @@
       </multiplicity>
     </attribute>
     <attribute>
-      <vodml-id>TProjectionAxis.targetRefValue</vodml-id>
-      <name>targetRefValue</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <vodml-id>MatrixElement.n</vodml-id>
+      <name>n</name>
+      <description>Matrix cell column number.</description>
       <datatype>
-        <vodml-ref>ivoa:real</vodml-ref>
+        <vodml-ref>ivoa:nonnegativeInteger</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>1</minOccurs>
@@ -283,11 +465,9 @@
       </multiplicity>
     </attribute>
     <attribute>
-      <vodml-id>TProjectionAxis.scale</vodml-id>
-      <name>scale</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <vodml-id>MatrixElement.value</vodml-id>
+      <name>value</name>
+      <description>Matrix cell value.</description>
       <datatype>
         <vodml-ref>ivoa:real</vodml-ref>
       </datatype>
@@ -298,20 +478,40 @@
     </attribute>
   </objectType>
 
+  <objectType abstract="true">
+    <vodml-id>Polynomial</vodml-id>
+    <name>Polynomial</name>
+    <description>Abstract head of a family of Polynomial distortion operations.</description>
+    <extends>
+      <vodml-ref>trans:TOperation</vodml-ref>
+    </extends>
+    <attribute>
+      <vodml-id>Polynomial.order</vodml-id>
+      <name>order</name>
+      <description>The order, or degree, of the polynomial expression.</description>
+      <datatype>
+        <vodml-ref>ivoa:nonnegativeInteger</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
+  </objectType>
+
   <objectType>
-    <vodml-id>Mappings</vodml-id>
-    <name>Mappings</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+    <vodml-id>Polynomial1D</vodml-id>
+    <name>Polynomial1D</name>
+    <description>A 1-Dimensional Polynomial transform represented by the expression:  X' = SUM( Ci*X**Pi),  i=0..order.  Each term is provided by a PolyCoeff1D object.  Missing terms are considered to have a coefficient of 0.0.</description>
+    <extends>
+      <vodml-ref>trans:Polynomial</vodml-ref>
+    </extends>
     <composition>
-      <vodml-id>Mappings.transforms</vodml-id>
-      <name>transforms</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <vodml-id>Polynomial1D.term</vodml-id>
+      <name>term</name>
+      <description>A term in the polynomial expression.</description>
       <datatype>
-        <vodml-ref>trans:Transform</vodml-ref>
+        <vodml-ref>trans:PolyCoeff1D</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>1</minOccurs>
@@ -321,25 +521,37 @@
   </objectType>
 
   <objectType>
-    <vodml-id>TMatrix</vodml-id>
-    <name>TMatrix</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+    <vodml-id>Polynomial2D</vodml-id>
+    <name>Polynomial2D</name>
+    <description>A 2-Dimensional Polynomial transform represented by the expression:  X' = SUMi,j( Cij*X**P1i*Y**P2j),  i=0..order, j=0..order.  Each term is provided by a PolyCoeff2D object.  Missing terms are considered to have a coefficient of 0.0.</description>
     <extends>
-      <vodml-ref>trans:TOperation</vodml-ref>
+      <vodml-ref>trans:Polynomial</vodml-ref>
     </extends>
-    <constraint>
-      <description>TMatrix.element[] maxlength = M*N</description>
-    </constraint>
-    <attribute>
-      <vodml-id>TMatrix.M</vodml-id>
-      <name>M</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+    <composition>
+      <vodml-id>Polynomial2D.term</vodml-id>
+      <name>term</name>
+      <description>A term in the polynomial expression.</description>
       <datatype>
-        <vodml-ref>ivoa:nonnegativeInteger</vodml-ref>
+        <vodml-ref>trans:PolyCoeff2D</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>-1</maxOccurs>
+      </multiplicity>
+    </composition>
+  </objectType>
+
+  <objectType>
+    <vodml-id>PolyCoeff1D</vodml-id>
+    <name>PolyCoeff1D</name>
+    <description>A term of the polynomial expression.  This object provides the coefficient (c) and power (p) of the term, forming the expression  c*X**p.
+ </description>
+    <attribute>
+      <vodml-id>PolyCoeff1D.coeff</vodml-id>
+      <name>coeff</name>
+      <description>Multiplicitive coefficient of the term.</description>
+      <datatype>
+        <vodml-ref>ivoa:real</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>1</minOccurs>
@@ -347,11 +559,9 @@
       </multiplicity>
     </attribute>
     <attribute>
-      <vodml-id>TMatrix.N</vodml-id>
-      <name>N</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <vodml-id>PolyCoeff1D.power</vodml-id>
+      <name>power</name>
+      <description>The power to raise the value for this term.</description>
       <datatype>
         <vodml-ref>ivoa:nonnegativeInteger</vodml-ref>
       </datatype>
@@ -360,14 +570,53 @@
         <maxOccurs>1</maxOccurs>
       </multiplicity>
     </attribute>
+  </objectType>
+
+  <objectType>
+    <vodml-id>PolyCoeff2D</vodml-id>
+    <name>PolyCoeff2D</name>
+    <description>A term of the polynomial expression.  This object provides the coefficient (c) and power (p) of the term, forming the expression  c*X**p.
+ </description>
+    <attribute>
+      <vodml-id>PolyCoeff2D.coeff</vodml-id>
+      <name>coeff</name>
+      <description>Multiplicitive coefficient of the term.</description>
+      <datatype>
+        <vodml-ref>ivoa:real</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
+    <attribute>
+      <vodml-id>PolyCoeff2D.power</vodml-id>
+      <name>power</name>
+      <description>The power to raise the values for this term in each dimension.</description>
+      <datatype>
+        <vodml-ref>ivoa:nonnegativeInteger</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>2</minOccurs>
+        <maxOccurs>2</maxOccurs>
+      </multiplicity>
+    </attribute>
+  </objectType>
+
+  <objectType abstract="true">
+    <vodml-id>WCSProjection</vodml-id>
+    <name>WCSProjection</name>
+    <description>Abstract head of World Coordinate System (WCS) projection operations.  We do not attempt to define the projections here, but instead, provide extensions which support the transforms described in the FITS WCS papers II and III.
+ </description>
+    <extends>
+      <vodml-ref>trans:TOperation</vodml-ref>
+    </extends>
     <composition>
-      <vodml-id>TMatrix.element</vodml-id>
-      <name>element</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <vodml-id>WCSProjection.param</vodml-id>
+      <name>param</name>
+      <description>Set of 0 or more parameters providing supplemental metadata required to execute a particular projection algorithm.  The number and meaning of the parameters depends on the algorithm.  They are typically in the from of "PVi_j" keyword/value pairs, so we provide a simple ProjectionParam element to accommodate these.  The detailed content specification is left to the WCS paper.</description>
       <datatype>
-        <vodml-ref>trans:TMatrixElement</vodml-ref>
+        <vodml-ref>trans:ProjectionParam</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>0</minOccurs>
@@ -377,45 +626,79 @@
   </objectType>
 
   <objectType>
-    <vodml-id>TMatrixElement</vodml-id>
-    <name>TMatrixElement</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+    <vodml-id>ProjectionParam</vodml-id>
+    <name>ProjectionParam</name>
+    <description>Simple parameter specification for WCS Projections.  The parameter is modeled as a simple name/value pair.  The details of expectations for the various projection algorithms is left to the WCS paper describing the algorithm.</description>
+    <attribute>
+      <vodml-id>ProjectionParam.name</vodml-id>
+      <name>name</name>
+      <description>The parameter name.  This is typically, but not always, given as a "PVi_j" key.</description>
+      <datatype>
+        <vodml-ref>ivoa:string</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
     <attribute>
-      <vodml-id>TMatrixElement.m</vodml-id>
-      <name>m</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <vodml-id>ProjectionParam.value</vodml-id>
+      <name>value</name>
+      <description>The value for the parameter. </description>
       <datatype>
-        <vodml-ref>ivoa:nonnegativeInteger</vodml-ref>
+        <vodml-ref>ivoa:real</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>1</minOccurs>
         <maxOccurs>1</maxOccurs>
       </multiplicity>
     </attribute>
+  </objectType>
+
+  <objectType>
+    <vodml-id>SkyProjection</vodml-id>
+    <name>SkyProjection</name>
+    <description>This class represents a two-dimensional projection of sky as detailed in the FITS WCS paper II.  As in the paper, this operation picks up from the intermediate coordinate system, AFTER the application of the linear transform from pixel to intermediate space.  In this model, the full transform from pixel to world is accomplished with a two-stage Transform, first applying the linear operations via a Matrix or other component operations, followed by the SkyProjection operation.</description>
+    <extends>
+      <vodml-ref>trans:WCSProjection</vodml-ref>
+    </extends>
     <attribute>
-      <vodml-id>TMatrixElement.n</vodml-id>
-      <name>n</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <vodml-id>SkyProjection.referenceValue</vodml-id>
+      <name>referenceValue</name>
+      <description>The target reference values in each dimension.  Equivalent to 'crval' in FITS WCS representations.</description>
       <datatype>
-        <vodml-ref>ivoa:nonnegativeInteger</vodml-ref>
+        <vodml-ref>ivoa:real</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>2</minOccurs>
+        <maxOccurs>2</maxOccurs>
+      </multiplicity>
+    </attribute>
+    <attribute>
+      <vodml-id>SkyProjection.algorithm</vodml-id>
+      <name>algorithm</name>
+      <description>The projection algorithm to apply.  The value MUST be taken from the enumeration of standard sky projection algorithms.  Extracted from 'ctype' in the FITS WCS representations.</description>
+      <datatype>
+        <vodml-ref>trans:SkyProjectionType</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>1</minOccurs>
         <maxOccurs>1</maxOccurs>
       </multiplicity>
     </attribute>
+  </objectType>
+
+  <objectType>
+    <vodml-id>SpectralProjection</vodml-id>
+    <name>SpectralProjection</name>
+    <description>This class represents a nonlinear one-dimensional spectral transform as detailed in the FITS WCS paper III.</description>
+    <extends>
+      <vodml-ref>trans:WCSProjection</vodml-ref>
+    </extends>
     <attribute>
-      <vodml-id>TMatrixElement.value</vodml-id>
-      <name>value</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <vodml-id>SpectralProjection.referenceValue</vodml-id>
+      <name>referenceValue</name>
+      <description>The target reference value for the axis.  Equivalent to 'crval' in FITS WCS representations.</description>
       <datatype>
         <vodml-ref>ivoa:real</vodml-ref>
       </datatype>
@@ -424,25 +707,45 @@
         <maxOccurs>1</maxOccurs>
       </multiplicity>
     </attribute>
+    <attribute>
+      <vodml-id>SpectralProjection.algorithm</vodml-id>
+      <name>algorithm</name>
+      <description>The projection algorithm to apply.  The value MUST be taken from the enumeration of non-linear spectral projection algorithms.  Extracted from 'ctype' in FITS WCS representations.</description>
+      <datatype>
+        <vodml-ref>trans:SpectralProjectionType</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
+    <attribute>
+      <vodml-id>SpectralProjection.coordType</vodml-id>
+      <name>coordType</name>
+      <description>The resulting spectral coordinate type code.  Values MUST be taken from the enumerated list of spectral coordinate types.  Extracted from 'ctype' in FITS WCS representations.</description>
+      <datatype>
+        <vodml-ref>trans:SpectralCoordType</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
   </objectType>
 
   <objectType>
-    <vodml-id>TLookup</vodml-id>
-    <name>TLookup</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+    <vodml-id>Lookup</vodml-id>
+    <name>Lookup</name>
+    <description>Defines a lookup table operation.  The Lookup is comprised of a series of value pairs (LookupEntry).  All members of the series MUST be of the same type.</description>
     <extends>
       <vodml-ref>trans:TOperation</vodml-ref>
     </extends>
     <composition>
-      <vodml-id>TLookup.entry</vodml-id>
+      <vodml-id>Lookup.entry</vodml-id>
       <name>entry</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>Set of lookup table entries forming a discrete mapping from the native space to the target space.</description>
       <datatype>
-        <vodml-ref>trans:TLookupEntry</vodml-ref>
+        <vodml-ref>trans:LookupEntry</vodml-ref>
       </datatype>
       <multiplicity>
         <minOccurs>1</minOccurs>
@@ -452,28 +755,22 @@
   </objectType>
 
   <objectType abstract="true">
-    <vodml-id>TLookupEntry</vodml-id>
-    <name>TLookupEntry</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+    <vodml-id>LookupEntry</vodml-id>
+    <name>LookupEntry</name>
+    <description>This is an abstract head of lookup table entry objects.  Each entry provides a discrete translation of a 'native' value to the corresponding 'target' value. </description>
   </objectType>
 
   <objectType>
-    <vodml-id>TNumericEntry</vodml-id>
-    <name>TNumericEntry</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+    <vodml-id>NumericEntry</vodml-id>
+    <name>NumericEntry</name>
+    <description>A 1-Dimensional discrete mapping of numeric values. </description>
     <extends>
-      <vodml-ref>trans:TLookupEntry</vodml-ref>
+      <vodml-ref>trans:LookupEntry</vodml-ref>
     </extends>
     <attribute>
-      <vodml-id>TNumericEntry.nativeValue</vodml-id>
+      <vodml-id>NumericEntry.nativeValue</vodml-id>
       <name>nativeValue</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>The native, or reference, value of the lookup entry.</description>
       <datatype>
         <vodml-ref>ivoa:real</vodml-ref>
       </datatype>
@@ -483,11 +780,9 @@
       </multiplicity>
     </attribute>
     <attribute>
-      <vodml-id>TNumericEntry.targetValue</vodml-id>
+      <vodml-id>NumericEntry.targetValue</vodml-id>
       <name>targetValue</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>The target, or resulting, value of the lookup entry.</description>
       <datatype>
         <vodml-ref>ivoa:real</vodml-ref>
       </datatype>
@@ -499,20 +794,16 @@
   </objectType>
 
   <objectType>
-    <vodml-id>TStringEntry</vodml-id>
-    <name>TStringEntry</name>
-    <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+    <vodml-id>StringEntry</vodml-id>
+    <name>StringEntry</name>
+    <description>A 1-Dimensional discrete mapping of an integer counter to a corresponding string form.  A simple use case example is to transform a pixel index value to a particular Polarization state represented as a string. </description>
     <extends>
-      <vodml-ref>trans:TLookupEntry</vodml-ref>
+      <vodml-ref>trans:LookupEntry</vodml-ref>
     </extends>
     <attribute>
-      <vodml-id>TStringEntry.nativeValue</vodml-id>
+      <vodml-id>StringEntry.nativeValue</vodml-id>
       <name>nativeValue</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>The native, or reference, value of the lookup entry.</description>
       <datatype>
         <vodml-ref>ivoa:integer</vodml-ref>
       </datatype>
@@ -522,11 +813,9 @@
       </multiplicity>
     </attribute>
     <attribute>
-      <vodml-id>TStringEntry.targetValue</vodml-id>
+      <vodml-id>StringEntry.targetValue</vodml-id>
       <name>targetValue</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+      <description>The target, or resulting, value of the lookup entry.</description>
       <datatype>
         <vodml-ref>ivoa:string</vodml-ref>
       </datatype>
@@ -537,4 +826,58 @@
     </attribute>
   </objectType>
 
+  <objectType>
+    <vodml-id>Reorder</vodml-id>
+    <name>Reorder</name>
+    <description>This operation facilitates the specification of axis order shuffling between operations.  For example, if we have a 3-dimensional coordinate (x,y,z) and wish to perform a 2-dimensional transform on the (x,z) plane, this operation, joined, allows us to define a new axis order  (y,x,z) to feed into the next step ( 1D + 2D operations).</description>
+    <extends>
+      <vodml-ref>trans:TOperation</vodml-ref>
+    </extends>
+    <attribute>
+      <vodml-id>Reorder.in</vodml-id>
+      <name>in</name>
+      <description>The input (original) axis/dimension number.</description>
+      <datatype>
+        <vodml-ref>ivoa:nonnegativeInteger</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
+    <attribute>
+      <vodml-id>Reorder.out</vodml-id>
+      <name>out</name>
+      <description>The output (target) axis/dimension number.</description>
+      <datatype>
+        <vodml-ref>ivoa:nonnegativeInteger</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>1</maxOccurs>
+      </multiplicity>
+    </attribute>
+  </objectType>
+
+  <objectType abstract="true">
+    <vodml-id>TComplexOperation</vodml-id>
+    <name>TComplexOperation</name>
+    <description>Abstract class to facilitate the combination of Operations in various ways.</description>
+    <extends>
+      <vodml-ref>trans:TOperation</vodml-ref>
+    </extends>
+    <composition>
+      <vodml-id>TComplexOperation.map</vodml-id>
+      <name>map</name>
+      <description>Components of the complex operation.  Depending on how the operations are combined, the interpretation of the components will change.</description>
+      <datatype>
+        <vodml-ref>trans:TOperation</vodml-ref>
+      </datatype>
+      <multiplicity>
+        <minOccurs>1</minOccurs>
+        <maxOccurs>-1</maxOccurs>
+      </multiplicity>
+    </composition>
+  </objectType>
+
 </vo-dml:model>
\ No newline at end of file

Added: trunk/projects/dm/STC/Trans/vo-dml/vo-dml.properties
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/projects/dm/STC/Trans/vo-dml/vo-dml.properties	Wed Dec 12 16:44:17 2018	(r5274)
@@ -0,0 +1,26 @@
+# -----------------------------------------------------------------------------
+# Properties defining the project and configuring the generation pipeline. 
+# Must be filled in/updated by users 
+# -----------------------------------------------------------------------------
+
+# prefix used in all generated file names
+# vo-dml target = ${dm.file.name}.vo-dml.xml
+# html target = ${dm.file.name}.html
+dm.filename.prefix = STC_trans-v1.0
+
+# Model in XMI format
+xmi.source = ../model/stc_trans_1.0_uml2p4p1.xmi
+
+# the "profile" according to which the XMI is built. 
+# MUST be one of:
+#xmi.source.profile = Altova_UML2.1.2
+#xmi.source.profile = MD_CE_12.1
+xmi.source.profile = Modelio_UML2.4.1
+
+# HTML generation
+# if HTML should be generated with a "preamble", here indicate the source of that preamble.
+# if empty or commented-out/does-not-exists, HTML is generated without preamble
+# preamble is expected to have structure like top of typical IVOA documents, ending with abstract
+# a sample preamble can be found in [TBD]
+html.preamble = 
+


More information about the Volutecommits mailing list