[Volute] r3587 - in trunk/projects/dm/vo-dml: models/STC2/prototype models/STC2/prototype/stc2_pattern_diagrams xslt

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


Author: mdittmar
Date: Thu Sep 29 22:25:49 2016
New Revision: 3587

Log:
fix relation of AbsoluteCoordinate to AssociatedValue; add error check in xmi2vo-dml script

Modified:
   trunk/projects/dm/vo-dml/models/STC2/prototype/STCPattern-2.0.html
   trunk/projects/dm/vo-dml/models/STC2/prototype/STCPattern-2.0.png
   trunk/projects/dm/vo-dml/models/STC2/prototype/STCPattern-2.0.vo-dml.xml
   trunk/projects/dm/vo-dml/models/STC2/prototype/stc2_pattern_diagrams/coord_pattern.png
   trunk/projects/dm/vo-dml/models/STC2/prototype/stc2_pattern_diagrams/generic_domain.png
   trunk/projects/dm/vo-dml/models/STC2/prototype/stc2_pattern_diagrams/pixel_domain.png
   trunk/projects/dm/vo-dml/models/STC2/prototype/stc2_pattern_diagrams/polarization_domain.png
   trunk/projects/dm/vo-dml/models/STC2/prototype/stc2_pattern_diagrams/redshift_domain.png
   trunk/projects/dm/vo-dml/models/STC2/prototype/stc2_pattern_diagrams/spatial_domain.png
   trunk/projects/dm/vo-dml/models/STC2/prototype/stc2_pattern_diagrams/spectral_domain.png
   trunk/projects/dm/vo-dml/models/STC2/prototype/stc2_pattern_diagrams/temporal_domain.png
   trunk/projects/dm/vo-dml/models/STC2/prototype/stc2_pattern_uml2p4p1.xmi
   trunk/projects/dm/vo-dml/xslt/xmi2vo-dml_Modelio_UML2.4.1.xsl

Modified: trunk/projects/dm/vo-dml/models/STC2/prototype/STCPattern-2.0.html
==============================================================================
--- trunk/projects/dm/vo-dml/models/STC2/prototype/STCPattern-2.0.html	Thu Sep 29 09:16:08 2016	(r3586)
+++ trunk/projects/dm/vo-dml/models/STC2/prototype/STCPattern-2.0.html	Thu Sep 29 22:25:49 2016	(r3587)
@@ -52,7 +52,7 @@
         </tr>
         <tr>
           <td>2.4.1</td>
-          <td>    <a href="#domain.generic.AssociatedQuantity">objectType: AssociatedQuantity</a></td>
+          <td>    <a href="#domain.generic.AssociatedValue">dataType: AssociatedValue</a></td>
         </tr>
         <tr>
           <td>2.4.2</td>
@@ -80,7 +80,7 @@
         </tr>
         <tr>
           <td>2.4.8</td>
-          <td>    <a href="#domain.generic.GenericCoord">primitiveType: GenericCoord</a></td>
+          <td>    <a href="#domain.generic.GenericCoord">dataType: GenericCoord</a></td>
         </tr>
         <tr>
           <td>2.4.9</td>
@@ -108,7 +108,7 @@
         </tr>
         <tr>
           <td>2.5.1</td>
-          <td>    <a href="#domain.pixel.AssociatedQuantity">objectType: AssociatedQuantity</a></td>
+          <td>    <a href="#domain.pixel.AssociatedValue">dataType: AssociatedValue</a></td>
         </tr>
         <tr>
           <td>2.5.2</td>
@@ -140,11 +140,11 @@
         </tr>
         <tr>
           <td>2.5.9</td>
-          <td>    <a href="#domain.pixel.PixelCoord1D">primitiveType: PixelCoord1D</a></td>
+          <td>    <a href="#domain.pixel.PixelCoord1D">dataType: PixelCoord1D</a></td>
         </tr>
         <tr>
           <td>2.5.10</td>
-          <td>    <a href="#domain.pixel.PixelCoord2D">primitiveType: PixelCoord2D</a></td>
+          <td>    <a href="#domain.pixel.PixelCoord2D">dataType: PixelCoord2D</a></td>
         </tr>
         <tr>
           <td>2.5.11</td>
@@ -156,7 +156,7 @@
         </tr>
         <tr>
           <td>2.5.13</td>
-          <td>    <a href="#domain.pixel.PixellCoord3D">primitiveType: PixellCoord3D</a></td>
+          <td>    <a href="#domain.pixel.PixellCoord3D">dataType: PixellCoord3D</a></td>
         </tr>
         <tr>
           <td>2.5.14</td>
@@ -168,19 +168,19 @@
         </tr>
         <tr>
           <td>2.6.1</td>
-          <td>    <a href="#domain.polarization.AssociatedCircularPol">objectType: AssociatedCircularPol</a></td>
+          <td>    <a href="#domain.polarization.AssociatedCircularPol">dataType: AssociatedCircularPol</a></td>
         </tr>
         <tr>
           <td>2.6.2</td>
-          <td>    <a href="#domain.polarization.AssociatedLinearPol">objectType: AssociatedLinearPol</a></td>
+          <td>    <a href="#domain.polarization.AssociatedLinearPol">dataType: AssociatedLinearPol</a></td>
         </tr>
         <tr>
           <td>2.6.3</td>
-          <td>    <a href="#domain.polarization.AssociatedStokesPol">objectType: AssociatedStokesPol</a></td>
+          <td>    <a href="#domain.polarization.AssociatedStokesPol">dataType: AssociatedStokesPol</a></td>
         </tr>
         <tr>
           <td>2.6.4</td>
-          <td>    <a href="#domain.polarization.AssociatedVectorPol">objectType: AssociatedVectorPol</a></td>
+          <td>    <a href="#domain.polarization.AssociatedVectorPol">dataType: AssociatedVectorPol</a></td>
         </tr>
         <tr>
           <td>2.6.5</td>
@@ -288,7 +288,7 @@
         </tr>
         <tr>
           <td>2.7.1</td>
-          <td>    <a href="#domain.redshift.AssociatedQuantity">objectType: AssociatedQuantity</a></td>
+          <td>    <a href="#domain.redshift.AssociatedValue">dataType: AssociatedValue</a></td>
         </tr>
         <tr>
           <td>2.7.2</td>
@@ -360,7 +360,7 @@
         </tr>
         <tr>
           <td>2.8.1</td>
-          <td>    <a href="#domain.spatial.AssociatedQuantity">objectType: AssociatedQuantity</a></td>
+          <td>    <a href="#domain.spatial.AssociatedValue">dataType: AssociatedValue</a></td>
         </tr>
         <tr>
           <td>2.8.2</td>
@@ -472,15 +472,15 @@
         </tr>
         <tr>
           <td>2.8.29</td>
-          <td>    <a href="#domain.spatial.SpatialCoord1D">primitiveType: SpatialCoord1D</a></td>
+          <td>    <a href="#domain.spatial.SpatialCoord1D">dataType: SpatialCoord1D</a></td>
         </tr>
         <tr>
           <td>2.8.30</td>
-          <td>    <a href="#domain.spatial.SpatialCoord2D">primitiveType: SpatialCoord2D</a></td>
+          <td>    <a href="#domain.spatial.SpatialCoord2D">dataType: SpatialCoord2D</a></td>
         </tr>
         <tr>
           <td>2.8.31</td>
-          <td>    <a href="#domain.spatial.SpatialCoord3D">primitiveType: SpatialCoord3D</a></td>
+          <td>    <a href="#domain.spatial.SpatialCoord3D">dataType: SpatialCoord3D</a></td>
         </tr>
         <tr>
           <td>2.8.32</td>
@@ -528,7 +528,7 @@
         </tr>
         <tr>
           <td>2.9.1</td>
-          <td>    <a href="#domain.spectral.AssociatedQuantity">dataType: AssociatedQuantity</a></td>
+          <td>    <a href="#domain.spectral.AssociatedValue">dataType: AssociatedValue</a></td>
         </tr>
         <tr>
           <td>2.9.2</td>
@@ -608,7 +608,7 @@
         </tr>
         <tr>
           <td>2.10.1</td>
-          <td>    <a href="#domain.temporal.AssociatedQuantity">dataType: AssociatedQuantity</a></td>
+          <td>    <a href="#domain.temporal.AssociatedValue">dataType: AssociatedValue</a></td>
         </tr>
         <tr>
           <td>2.10.2</td>
@@ -838,7 +838,7 @@
       <tr>
         <td align="right"><b>Date</b></td>
         <td> : </td>
-        <td>2016-09-28T15:43:14</td>
+        <td>2016-09-29T16:17:54</td>
       </tr>
       <tr>
         <td align="right"><b>Version</b></td>
@@ -885,189 +885,189 @@
 <area shape="rect" id="node14" href="#stctypes.Matrix" title="{<<primitive type>>\nstctypes/Matrix}" alt="" coords="1343,677,1449,726"/>
 <area shape="rect" id="node15" href="#stctypes.Matrix2x2" title="{<<primitive type>>\nstctypes/Matrix2x2}" alt="" coords="1277,273,1384,322"/>
 <area shape="rect" id="node16" href="#stctypes.Matrix3x3" title="{<<primitive type>>\nstctypes/Matrix3x3}" alt="" coords="1408,273,1515,322"/>
-<area shape="rect" id="node17" href="#stctypes.Handedness" title="{<<enumeration>>\lstctypes/Handedness|+left\l+right\l}" alt="" coords="1916,259,2025,335"/>
-<area shape="rect" id="node18" href="#frametransforms.Projection" title="{<<enumeration>>\lframetransforms/Projection|+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="3791,126,3932,469"/>
-<area shape="rect" id="node19" href="#frametransforms.TPolarization" title="{frametransforms/TPolarization}" alt="" coords="9491,677,9645,726"/>
-<area shape="rect" id="node33" href="#frametransforms.TLookup" title="{frametransforms/TLookup|+nvals : ivoa:nonnegativeInteger\l}" alt="" coords="7201,827,7364,877"/>
-<area shape="rect" id="node38" href="#frametransforms.TPolarizationEntry" title="{frametransforms/TPolarizationEntry}" alt="" coords="10133,827,10312,877"/>
-<area shape="rect" id="node20" href="#frametransforms.TPolStokes" title="{frametransforms/TPolStokes|+nativeValue : ivoa:integer\l+polType : stc2:domain.polarization.PolStokes\l}" alt="" coords="9867,670,10088,733"/>
-<area shape="rect" id="node21" href="#frametransforms.TPolLinear" title="{frametransforms/TPolLinear|+nativeValue : ivoa:integer\l+polType : stc2:domain.polarization.PolLinear\l}" alt="" coords="10112,670,10333,733"/>
-<area shape="rect" id="node22" href="#frametransforms.TPolCircular" title="{frametransforms/TPolCircular|+nativeValue : ivoa:integer\l+polType : stc2:domain.polarization.PolCircular\l}" alt="" coords="10357,670,10587,733"/>
-<area shape="rect" id="node23" href="#frametransforms.TPolVector" title="{frametransforms/TPolVector|+nativeValue : ivoa:integer\l+polType : stc2:domain.polarization.PolVector\l}" alt="" coords="10611,670,10835,733"/>
-<area shape="rect" id="node24" href="#frametransforms.TUnit" title="{frametransforms/TUnit}" alt="" coords="1828,827,1951,877"/>
-<area shape="rect" id="node40" href="#frametransforms.Transform" title="{frametransforms/Transform}" alt="" coords="2697,965,2839,1014"/>
-<area shape="rect" id="node25" href="#frametransforms.TShift1D" title="{frametransforms/TShift1D|+shift : ivoa:real\l}" alt="" coords="2455,827,2593,877"/>
-<area shape="rect" id="node26" href="#frametransforms.TShift2D" title="{frametransforms/TShift2D|+shift : ivoa:real\l}" alt="" coords="2617,827,2756,877"/>
-<area shape="rect" id="node27" href="#frametransforms.TScale1D" title="{frametransforms/TScale1D|+factor : ivoa:real\l}" alt="" coords="2780,827,2921,877"/>
-<area shape="rect" id="node28" href="#frametransforms.TScale2D" title="{frametransforms/TScale2D|+factor : ivoa:real\l}" alt="" coords="2945,827,3087,877"/>
-<area shape="rect" id="node29" href="#frametransforms.TRotate2D" title="{frametransforms/TRotate2D|+angle : ivoa:real\l}" alt="" coords="3111,827,3255,877"/>
-<area shape="rect" id="node30" href="#frametransforms.TMatrix" title="{frametransforms/TMatrix|+matrix : stc2:stctypes.Matrix\l}" alt="" coords="3279,827,3428,877"/>
-<area shape="rect" id="node31" href="#frametransforms.TPolynomial" title="{frametransforms/TPolynomial|+order : ivoa:nonnegativeInteger\l}" alt="" coords="1641,827,1804,877"/>
-<area shape="rect" id="node39" href="#frametransforms.TPolyCoeff" title="{frametransforms/TPolyCoeff|+coeff : ivoa:real\l+power : ivoa:real\l}" alt="" coords="1649,958,1796,1021"/>
-<area shape="rect" id="node32" href="#frametransforms.TProjection1D" title="{frametransforms/TProjection1D|+algorithm : stc2:frametransforms.Projection\l+nativeRefValue : ivoa:real\l+targetRefValue : ivoa:real\l}" alt="" coords="1975,814,2191,890"/>
-<area shape="rect" id="node34" href="#frametransforms.TLookupMap" title="{frametransforms/TLookupMap}" alt="" coords="8063,677,8217,726"/>
-<area shape="rect" id="node35" href="#frametransforms.TLookupEntry" title="{frametransforms/TLookupEntry}" alt="" coords="9676,827,9836,877"/>
-<area shape="rect" id="node36" href="#frametransforms.TLookupEntry1D" title="{frametransforms/TLookupEntry1D|+nativeValue : ivoa:real\l+targetValue : ivoa:real\l}" alt="" coords="9293,670,9467,733"/>
-<area shape="rect" id="node37" href="#frametransforms.TLookupEntry2D" title="{frametransforms/TLookupEntry2D|+nativeValue : ivoa:real\l+targetValue : ivoa:real\l}" alt="" coords="9669,670,9843,733"/>
-<area shape="rect" id="node41" href="#frametransforms.Mappings" title="{frametransforms/Mappings}" alt="" coords="3404,677,3543,726"/>
-<area shape="rect" id="node43" href="#frametransforms.FrameTransform" title="{frametransforms/FrameTransform}" alt="" coords="3639,827,3809,877"/>
-<area shape="rect" id="node42" href="#frametransforms.TProjection2D" title="{frametransforms/TProjection2D|+algorithm : stc2:frametransforms.Projection\l+nativeRefValue : ivoa:real\l+targetRefValue : ivoa:real\l}" alt="" coords="2215,814,2431,890"/>
-<area shape="rect" id="node46" href="#coordsystem.CoordFrame" title="{coordsystem/CoordFrame}" alt="" coords="4275,965,4405,1014"/>
-<area shape="rect" id="node44" href="#coordsystem.CoordSys" title="{coordsystem/CoordSys}" alt="" coords="3567,677,3684,726"/>
-<area shape="rect" id="node65" href="#domain.generic.GenericFrame" title="{domain/generic/GenericFrame}" alt="" coords="3833,827,3988,877"/>
-<area shape="rect" id="node45" href="#coordsystem.AstroCoordSystem" title="{coordsystem/AstroCoordSystem|+planetaryEphemeris : ivoa:string\l}" alt="" coords="4827,273,4995,322"/>
-<area shape="rect" id="node93" href="#domain.spatial.SpaceFrame" title="{domain/spatial/SpaceFrame}" alt="" coords="4185,677,4327,726"/>
-<area shape="rect" id="node122" href="#domain.temporal.TimeFrame" title="{domain/temporal/TimeFrame}" alt="" coords="6388,677,6535,726"/>
-<area shape="rect" id="node137" href="#domain.spectral.SpectralFrame" title="{domain/spectral/SpectralFrame}" alt="" coords="5428,677,5585,726"/>
-<area shape="rect" id="node159" href="#domain.redshift.RedshiftFrame" title="{domain/redshift/RedshiftFrame}" alt="" coords="4351,677,4505,726"/>
-<area shape="rect" id="node186" href="#domain.polarization.PolarizationFrame" title="{domain/polarization/PolarizationFrame}" alt="" coords="6175,677,6364,726"/>
-<area shape="rect" id="node47" href="#coordsystem.PixelCoordSystem" title="{coordsystem/PixelCoordSystem}" alt="" coords="1473,677,1631,726"/>
-<area shape="rect" id="node53" href="#domain.pixel.PixelFrame" title="{domain/pixel/PixelFrame}" alt="" coords="1487,827,1617,877"/>
-<area shape="rect" id="node48" href="#domain.pixel.PixelCoord1D" title="{<<primitive type>>\ndomain/pixel/PixelCoord1D}" alt="" coords="10685,273,10827,322"/>
-<area shape="rect" id="node51" href="#domain.pixel.PixelCoord" title="{<<datatype>>\ndomain/pixel/PixelCoord}" alt="" coords="10859,677,10987,726"/>
-<area shape="rect" id="node49" href="#domain.pixel.PixellCoord3D" title="{<<primitive type>>\ndomain/pixel/PixellCoord3D}" alt="" coords="10851,273,10995,322"/>
-<area shape="rect" id="node50" href="#domain.pixel.PixelCoord2D" title="{<<primitive type>>\ndomain/pixel/PixelCoord2D}" alt="" coords="11019,273,11160,322"/>
-<area shape="rect" id="node52" href="#domain.pixel.AssociatedQuantity" title="{domain/pixel/AssociatedQuantity|+loc : ivoa:RealQuantity\l}" alt="" coords="1152,965,1315,1014"/>
-<area shape="rect" id="node54" href="#domain.pixel.PixelAxis" title="{domain/pixel/PixelAxis|+length : ivoa:nonnegativeInteger\l}" alt="" coords="1231,1095,1396,1145"/>
-<area shape="rect" id="node59" href="#domain.pixel.PixelBasis" title="{domain/pixel/PixelBasis}" alt="" coords="1339,965,1464,1014"/>
-<area shape="rect" id="node61" href="#domain.pixel.PixelSpace" title="{domain/pixel/PixelSpace}" alt="" coords="1488,965,1616,1014"/>
-<area shape="rect" id="node55" href="#domain.pixel.Pixel" title="{domain/pixel/Pixel}" alt="" coords="11457,677,11559,726"/>
-<area shape="rect" id="node56" href="#domain.pixel.Pixel1D" title="{domain/pixel/Pixel1D|+coord : stc2:domain.pixel.PixelCoord1D\l}" alt="" coords="11184,273,11384,322"/>
-<area shape="rect" id="node57" href="#domain.pixel.Pixel2D" title="{domain/pixel/Pixel2D|+coord : stc2:domain.pixel.PixelCoord2D\l}" alt="" coords="11408,273,11608,322"/>
-<area shape="rect" id="node58" href="#domain.pixel.Pixel3D" title="{domain/pixel/Pixel3D|+coord : stc2:domain.pixel.PixellCoord3D\l}" alt="" coords="11632,273,11835,322"/>
-<area shape="rect" id="node60" href="#domain.pixel.StdPixelBasis" title="{domain/pixel/StdPixelBasis}" alt="" coords="1324,827,1463,877"/>
-<area shape="rect" id="node62" href="#domain.generic.GenericCoord" title="{<<primitive type>>\ndomain/generic/GenericCoord}" alt="" coords="11859,273,12011,322"/>
-<area shape="rect" id="node63" href="#domain.generic.GenericBasis" title="{domain/generic/GenericBasis}" alt="" coords="3481,965,3631,1014"/>
-<area shape="rect" id="node64" href="#domain.generic.StdGenericBasis" title="{domain/generic/StdGenericBasis}" alt="" coords="3452,827,3615,877"/>
-<area shape="rect" id="node67" href="#domain.generic.CoordSpace" title="{domain/generic/CoordSpace}" alt="" coords="3932,965,4073,1014"/>
-<area shape="rect" id="node66" href="#domain.generic.CoordAxis" title="{domain/generic/CoordAxis|+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="3817,1089,3983,1151"/>
-<area shape="rect" id="node68" href="#domain.generic.Cartesian" title="{domain/generic/Cartesian}" alt="" coords="4172,827,4303,877"/>
-<area shape="rect" id="node69" href="#domain.generic.Measurement" title="{domain/generic/Measurement|+coord : stc2:domain.generic.GenericCoord\l}" alt="" coords="12035,273,12245,322"/>
-<area shape="rect" id="node70" href="#domain.generic.Uncertainty" title="{domain/generic/Uncertainty|+flavor : ivoa:string\l}" alt="" coords="12428,677,12569,726"/>
-<area shape="rect" id="node71" href="#domain.generic.Bounds" title="{domain/generic/Bounds|+hiLimit : stc2:domain.generic.GenericCoord\l+loLimit : stc2:domain.generic.GenericCoord\l}" alt="" coords="12269,266,12488,329"/>
-<area shape="rect" id="node72" href="#domain.generic.SymmetricInterval" title="{domain/generic/SymmetricInterval|+center : stc2:domain.generic.GenericCoord\l+size : ivoa:RealQuantity\l}" alt="" coords="12512,266,12725,329"/>
-<area shape="rect" id="node73" href="#domain.generic.AssymetricInterval" title="{domain/generic/AssymetricInterval|+center : stc2:domain.generic.GenericCoord\l+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="12749,259,12963,335"/>
-<area shape="rect" id="node74" href="#domain.generic.AssociatedQuantity" title="{domain/generic/AssociatedQuantity|+loc : ivoa:RealQuantity\l}" alt="" coords="3679,965,3852,1014"/>
-<area shape="rect" id="node75" href="#domain.spatial.SpatialCoord1D" title="{<<primitive type>>\ndomain/spatial/SpatialCoord1D}" alt="" coords="12987,273,13141,322"/>
-<area shape="rect" id="node81" href="#domain.spatial.SpatialCoord" title="{<<datatype>>\ndomain/spatial/SpatialCoord}" alt="" coords="13172,677,13313,726"/>
-<area shape="rect" id="node76" href="#domain.spatial.SpatialCoord2D" title="{<<primitive type>>\ndomain/spatial/SpatialCoord2D}" alt="" coords="13165,273,13320,322"/>
-<area shape="rect" id="node77" href="#domain.spatial.SpatialCoord3D" title="{<<primitive type>>\ndomain/spatial/SpatialCoord3D}" alt="" coords="13344,273,13499,322"/>
-<area shape="rect" id="node78" href="#domain.spatial.StdRefPosition" title="{<<enumeration>>\ldomain/spatial/StdRefPosition|+TOPOCENTER\l+BARYCENTER\l+HELIOCENTER\l+GEOCENTER\l+GALACTIC_CENTER\l+LOCAL_GROUP_CENTER\l+MOON\l+EMBARYCENTER\l+MERCURY\l+VENUS\l+MARS\l+JUPITER\l+SATURN\l+URANUS\l+NEPTUNE\l+PLUTO\l+RELOCATABLE\l+LSR\l+LSRK\l+LSRD\l+UNKNOWN\l+CUSTOM\l}" alt="" coords="13523,126,13677,469"/>
-<area shape="rect" id="node79" href="#domain.spatial.StdRefFrame" title="{<<enumeration>>\ldomain/spatial/StdRefFrame|+ICRS\l+FK4\l+FK5\l+ECLIPTIC\l+GALACTIC_I\l+GALACTIC_II\l+SUPER_GALACTIC\l+AZ_EL\l+BODY\l+GEO_C\l+GEO_D\l+MAG\l+GSE\l+GSM\l+SM\l+HGC\l+HEE\l+HEEQ\l+HCI\l+HCD\l+MERCURY_C\l+VENUS_C\l+LUNA_C\l+MARS_C\l+JUPITER_C_III\l+SATURN_C_III\l+URANUS_C_III\l+NEPTUNE_C_III\l+PLUTO_C\l+MERCURY_G\l+VENUS_G\l+LUNA_G\l+MARS_G\l+JUPITER_G_III\l+SATURN_G_III\l+URANUS_G_III\l+NEPTUNE_G_III\l+PLUTO_G\l+UNKNOWN\l+CUSTOM\l}" alt="" coords="13701,6,13845,589"/>
-<area shape="rect" id="node80" href="#domain.spatial.EpochType" title="{<<enumeration>>\ldomain/spatial/EpochType|+J\l+B\l}" alt="" coords="13869,259,14005,335"/>
-<area shape="rect" id="node82" href="#domain.spatial.Epoch" title="{<<datatype>>\ndomain/spatial/Epoch|+type : stc2:domain.spatial.EpochType\l+year : ivoa:real\l}" alt="" coords="14029,259,14219,335"/>
-<area shape="rect" id="node83" href="#domain.spatial.SpaceBasis" title="{domain/spatial/SpaceBasis}" alt="" coords="4012,827,4148,877"/>
-<area shape="rect" id="node84" href="#domain.spatial.StdSpaceBasis" title="{domain/spatial/StdSpaceBasis|+origin : stc2:domain.spatial.StdRefPosition\l+orientation : stc2:domain.spatial.StdRefFrame\l+equinox : stc2:domain.spatial.Epoch\l}" alt="" coords="3935,663,4161,739"/>
-<area shape="rect" id="node85" href="#domain.spatial.CustomSpaceBasis" title="{domain/spatial/CustomSpaceBasis|+origin : stc2:domain.spatial.SpatialCoord\l}" alt="" coords="3708,677,3911,726"/>
-<area shape="rect" id="node86" href="#domain.spatial.CoordSpace" title="{domain/spatial/CoordSpace}" alt="" coords="5143,827,5281,877"/>
-<area shape="rect" id="node94" href="#domain.spatial.CoordAxis" title="{domain/spatial/CoordAxis|+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="5368,958,5533,1021"/>
-<area shape="rect" id="node87" href="#domain.spatial.Spherical" title="{domain/spatial/Spherical}" alt="" coords="6023,677,6151,726"/>
-<area shape="rect" id="node88" href="#domain.spatial.Polar" title="{domain/spatial/Polar}" alt="" coords="5295,677,5404,726"/>
-<area shape="rect" id="node89" href="#domain.spatial.Cylindrical" title="{domain/spatial/Cylindrical}" alt="" coords="5865,677,5999,726"/>
-<area shape="rect" id="node90" href="#domain.spatial.Cartesian" title="{domain/spatial/Cartesian}" alt="" coords="4836,677,4964,726"/>
-<area shape="rect" id="node91" href="#domain.spatial.UnitSphere" title="{domain/spatial/UnitSphere}" alt="" coords="4988,677,5124,726"/>
-<area shape="rect" id="node92" href="#domain.spatial.HealPix" title="{domain/spatial/HealPix|+scheme : ivoa:string\l}" alt="" coords="5148,677,5271,726"/>
-<area shape="rect" id="node95" href="#domain.spatial.Position" title="{domain/spatial/Position}" alt="" coords="15257,677,15377,726"/>
-<area shape="rect" id="node96" href="#domain.spatial.Position1D" title="{domain/spatial/Position1D|+coord : stc2:domain.spatial.SpatialCoord1D\l}" alt="" coords="14973,273,15187,322"/>
-<area shape="rect" id="node99" href="#domain.spatial.Uncertainty1D" title="{domain/spatial/Uncertainty1D|+flavor : ivoa:string\l}" alt="" coords="14641,677,14791,726"/>
-<area shape="rect" id="node97" href="#domain.spatial.Position2D" title="{domain/spatial/Position2D|+coord : stc2:domain.spatial.SpatialCoord2D\l}" alt="" coords="15211,273,15424,322"/>
-<area shape="rect" id="node103" href="#domain.spatial.Uncertainty2D" title="{domain/spatial/Uncertainty2D|+flavor : ivoa:string\l}" alt="" coords="15849,677,15999,726"/>
-<area shape="rect" id="node98" href="#domain.spatial.Position3D" title="{domain/spatial/Position3D|+coord : stc2:domain.spatial.SpatialCoord3D\l}" alt="" coords="16421,273,16635,322"/>
-<area shape="rect" id="node109" href="#domain.spatial.Uncertainty3D" title="{domain/spatial/Uncertainty3D|+flavor : ivoa:string\l}" alt="" coords="17249,677,17399,726"/>
-<area shape="rect" id="node100" href="#domain.spatial.Bounds1D" title="{domain/spatial/Bounds1D|+hiLimit : stc2:domain.spatial.SpatialCoord1D\l+loLimit : stc2:domain.spatial.SpatialCoord1D\l}" alt="" coords="14728,266,14949,329"/>
-<area shape="rect" id="node101" href="#domain.spatial.SymmetricInterval" title="{domain/spatial/SymmetricInterval|+center : stc2:domain.spatial.SpatialCoord1D\l+size : ivoa:RealQuantity\l}" alt="" coords="14243,266,14461,329"/>
-<area shape="rect" id="node102" href="#domain.spatial.AssymetricInterval" title="{domain/spatial/AssymetricInterval|+center : stc2:domain.spatial.SpatialCoord1D\l+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="14485,259,14704,335"/>
-<area shape="rect" id="node104" href="#domain.spatial.Bounds2D" title="{domain/spatial/Bounds2D|+hiLimit : stc2:domain.spatial.SpatialCoord2D\l+loLimit : stc2:domain.spatial.SpatialCoord2D\l}" alt="" coords="15448,266,15669,329"/>
-<area shape="rect" id="node105" href="#domain.spatial.Circle" title="{domain/spatial/Circle|+center : stc2:domain.spatial.SpatialCoord2D\l+radius : ivoa:RealQuantity\l}" alt="" coords="15693,266,15912,329"/>
-<area shape="rect" id="node106" href="#domain.spatial.Rectangle" title="{domain/spatial/Rectangle|+center : stc2:domain.spatial.SpatialCoord2D\l+length : ivoa:RealQuantity\l+width : ivoa:RealQuantity\l}" alt="" coords="15936,259,16155,335"/>
-<area shape="rect" id="node107" href="#domain.spatial.Ellipse" title="{domain/spatial/Ellipse|+center : stc2:domain.spatial.SpatialCoord2D\l+semiAxes : ivoa:RealQuantity\l+rotation : ivoa:RealQuantity\l}" alt="" coords="16179,259,16397,335"/>
-<area shape="rect" id="node108" href="#domain.spatial.ErrorMatrix2x2" title="{domain/spatial/ErrorMatrix2x2|+matrix : stc2:stctypes.Matrix2x2\l}" alt="" coords="16659,273,16824,322"/>
-<area shape="rect" id="node110" href="#domain.spatial.Bounds3D" title="{domain/spatial/Bounds3D|+hiLimit : stc2:domain.spatial.SpatialCoord3D\l+loLimit : stc2:domain.spatial.SpatialCoord3D\l}" alt="" coords="16848,266,17069,329"/>
-<area shape="rect" id="node111" href="#domain.spatial.Sphere" title="{domain/spatial/Sphere|+center : stc2:domain.spatial.SpatialCoord3D\l+radius : ivoa:RealQuantity\l}" alt="" coords="17093,266,17312,329"/>
-<area shape="rect" id="node112" href="#domain.spatial.Cube" title="{domain/spatial/Cube|+center : stc2:domain.spatial.SpatialCoord3D\l+length : ivoa:RealQuantity\l+width : ivoa:RealQuantity\l+height : ivoa:RealQuantity\l}" alt="" coords="17336,253,17555,342"/>
-<area shape="rect" id="node113" href="#domain.spatial.Ellipsoid" title="{domain/spatial/Ellipsoid|+center : stc2:domain.spatial.SpatialCoord3D\l+semiAxes : ivoa:RealQuantity\l+rotation : ivoa:RealQuantity\l}" alt="" coords="17579,259,17797,335"/>
-<area shape="rect" id="node114" href="#domain.spatial.ErrorMatrix3x3" title="{domain/spatial/ErrorMatrix3x3|+matrix : stc2:stctypes.Matrix3x3\l}" alt="" coords="17821,273,17987,322"/>
-<area shape="rect" id="node115" href="#domain.spatial.AssociatedQuantity" title="{domain/spatial/AssociatedQuantity|+loc : ivoa:RealQuantity\l}" alt="" coords="5587,827,5757,877"/>
-<area shape="rect" id="node116" href="#domain.temporal.Calendar" title="{<<enumeration>>\ldomain/temporal/Calendar|+Gregorian\l+Julian\l+Roman\l}" alt="" coords="18011,253,18147,342"/>
-<area shape="rect" id="node117" href="#domain.temporal.TimeScale" title="{<<enumeration>>\ldomain/temporal/TimeScale|+TT\l+ET\l+TDB\l+TCG\l+TCB\l+TAI\l+UTC\l+LST\l+LOCAL\l}" alt="" coords="18171,213,18315,382"/>
-<area shape="rect" id="node118" href="#domain.temporal.TimeCoord" title="{<<datatype>>\ndomain/temporal/TimeCoord}" alt="" coords="18339,273,18485,322"/>
-<area shape="rect" id="node119" href="#domain.temporal.TimeOffset" title="{<<datatype>>\ndomain/temporal/TimeOffset|+loc : ivoa:RealQuantity\l}" alt="" coords="7079,670,7225,733"/>
-<area shape="rect" id="node121" href="#domain.temporal.AssociatedQuantity" title="{<<datatype>>\ndomain/temporal/AssociatedQuantity}" alt="" coords="6828,827,7009,877"/>
-<area shape="rect" id="node120" href="#domain.temporal.TimeInstant" title="{<<datatype>>\ndomain/temporal/TimeInstant|+loc : ivoa:datetime\l}" alt="" coords="6905,670,7055,733"/>
-<area shape="rect" id="node123" href="#domain.temporal.CoordAxis" title="{domain/temporal/CoordAxis|+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="6836,958,7001,1021"/>
-<area shape="rect" id="node129" href="#domain.temporal.TimeBasis" title="{domain/temporal/TimeBasis}" alt="" coords="7588,827,7729,877"/>
-<area shape="rect" id="node132" href="#domain.temporal.CoordSpace" title="{domain/temporal/CoordSpace}" alt="" coords="6655,827,6804,877"/>
-<area shape="rect" id="node124" href="#domain.temporal.Time" title="{domain/temporal/Time|+coord : stc2:domain.temporal.TimeCoord\l}" alt="" coords="18509,273,18715,322"/>
-<area shape="rect" id="node125" href="#domain.temporal.Uncertainty" title="{domain/temporal/Uncertainty|+flavor : ivoa:string\l}" alt="" coords="18869,677,19016,726"/>
-<area shape="rect" id="node126" href="#domain.temporal.Bounds" title="{domain/temporal/Bounds|+hiLimit : stc2:domain.temporal.TimeCoord\l+loLimit : stc2:domain.temporal.TimeCoord\l}" alt="" coords="18739,266,18952,329"/>
-<area shape="rect" id="node127" href="#domain.temporal.SymmetricInterval" title="{domain/temporal/SymmetricInterval|+center : stc2:domain.temporal.TimeCoord\l+size : ivoa:RealQuantity\l}" alt="" coords="18976,266,19184,329"/>
-<area shape="rect" id="node128" href="#domain.temporal.AssymetricInterval" title="{domain/temporal/AssymetricInterval|+center : stc2:domain.temporal.TimeCoord\l+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="19208,259,19416,335"/>
-<area shape="rect" id="node130" href="#domain.temporal.StdTimeBasis" title="{domain/temporal/StdTimeBasis|+origin : stc2:domain.temporal.Calendar\l+timescale : stc2:domain.temporal.TimeScale\l+refPosition : stc2:domain.spatial.StdRefPosition\l+refDirection : stc2:domain.spatial.SpatialCoord\l}" alt="" coords="7249,657,7481,746"/>
-<area shape="rect" id="node131" href="#domain.temporal.CustomTimeBasis" title="{domain/temporal/CustomTimeBasis|+offset : stc2:domain.temporal.TimeOffset\l+refPosition : stc2:domain.spatial.SpatialCoord\l}" alt="" coords="7505,670,7729,733"/>
-<area shape="rect" id="node133" href="#domain.temporal.Cartesian" title="{domain/temporal/Cartesian}" alt="" coords="6743,677,6881,726"/>
-<area shape="rect" id="node134" href="#domain.temporal.TimeSpace" title="{domain/temporal/TimeSpace}" alt="" coords="7307,273,7453,322"/>
-<area shape="rect" id="node135" href="#domain.spectral.SpectralCoord" title="{<<datatype>>\ndomain/spectral/SpectralCoord}" alt="" coords="19517,273,19672,322"/>
-<area shape="rect" id="node136" href="#domain.spectral.AssociatedQuantity" title="{<<datatype>>\ndomain/spectral/AssociatedQuantity|+loc : ivoa:RealQuantity\l}" alt="" coords="7388,821,7564,883"/>
-<area shape="rect" id="node138" href="#domain.spectral.CoordAxis" title="{domain/spectral/CoordAxis|+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="7735,958,7900,1021"/>
-<area shape="rect" id="node144" href="#domain.spectral.SpectralBasis" title="{domain/spectral/SpectralBasis}" alt="" coords="5781,827,5933,877"/>
-<area shape="rect" id="node146" href="#domain.spectral.CoordSpace" title="{domain/spectral/CoordSpace}" alt="" coords="7033,827,7177,877"/>
-<area shape="rect" id="node139" href="#domain.spectral.DerivedSpectralCoordinate" title="{domain/spectral/DerivedSpectralCoordinate|+coord : stc2:domain.spectral.SpectralCoord\l}" alt="" coords="19863,677,20076,726"/>
-<area shape="rect" id="node140" href="#domain.spectral.Uncertainty" title="{domain/spectral/Uncertainty|+flavor : ivoa:string\l}" alt="" coords="19539,827,19683,877"/>
-<area shape="rect" id="node141" href="#domain.spectral.Bounds" title="{domain/spectral/Bounds|+hiLimit : stc2:domain.spectral.SpectralCoord\l+loLimit : stc2:domain.spectral.SpectralCoord\l}" alt="" coords="19137,670,19359,733"/>
-<area shape="rect" id="node142" href="#domain.spectral.SymmetricInterval" title="{domain/spectral/SymmetricInterval|+center : stc2:domain.spectral.SpectralCoord\l+size : ivoa:RealQuantity\l}" alt="" coords="19383,670,19599,733"/>
-<area shape="rect" id="node143" href="#domain.spectral.AssymetricInterval" title="{domain/spectral/AssymetricInterval|+center : stc2:domain.spectral.SpectralCoord\l+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="19623,663,19839,739"/>
-<area shape="rect" id="node145" href="#domain.spectral.StdSpectralBasis" title="{domain/spectral/StdSpectralBasis|+refPosition : stc2:domain.spatial.StdRefPosition\l}" alt="" coords="5609,677,5841,726"/>
-<area shape="rect" id="node147" href="#domain.spectral.Cartesian" title="{domain/spectral/Cartesian}" alt="" coords="7855,677,7988,726"/>
-<area shape="rect" id="node148" href="#domain.spectral.EnergySpace" title="{domain/spectral/EnergySpace}" alt="" coords="8157,273,8307,322"/>
-<area shape="rect" id="node149" href="#domain.spectral.FrequencySpace" title="{domain/spectral/FrequencySpace}" alt="" coords="7741,273,7904,322"/>
-<area shape="rect" id="node150" href="#domain.spectral.WavelengthSpace" title="{domain/spectral/WavelengthSpace}" alt="" coords="7936,273,8107,322"/>
-<area shape="rect" id="node151" href="#domain.spectral.Frequency" title="{domain/spectral/Frequency}" alt="" coords="19735,273,19873,322"/>
-<area shape="rect" id="node152" href="#domain.spectral.Wavelength" title="{domain/spectral/Wavelength}" alt="" coords="19897,273,20041,322"/>
-<area shape="rect" id="node153" href="#domain.spectral.Energy" title="{domain/spectral/Energy}" alt="" coords="20065,273,20188,322"/>
-<area shape="rect" id="node154" href="#domain.redshift.DopplerDefinition" title="{<<enumeration>>\ldomain/redshift/DopplerDefinition|+optical\l+radio\l+relativistic\l+redshift\l}" alt="" coords="20320,246,20491,349"/>
-<area shape="rect" id="node155" href="#domain.redshift.RedshiftCoord" title="{<<datatype>>\ndomain/redshift/RedshiftCoord}" alt="" coords="20563,273,20717,322"/>
-<area shape="rect" id="node156" href="#domain.redshift.RedshiftBasis" title="{domain/redshift/RedshiftBasis}" alt="" coords="4468,827,4617,877"/>
-<area shape="rect" id="node157" href="#domain.redshift.StdRedshiftBasis" title="{domain/redshift/StdRedshiftBasis|+refPosition : stc2:domain.spatial.StdRefPosition\l+dopplerDefinition : stc2:domain.redshift.DopplerDefinition\l}" alt="" coords="4529,670,4812,733"/>
-<area shape="rect" id="node158" href="#domain.redshift.AssociatedQuantity" title="{domain/redshift/AssociatedQuantity|+loc : ivoa:RealQuantity\l}" alt="" coords="8281,827,8457,877"/>
-<area shape="rect" id="node160" href="#domain.redshift.CoordAxis" title="{domain/redshift/CoordAxis|+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="8287,958,8452,1021"/>
-<area shape="rect" id="node168" href="#domain.redshift.CoordSpace" title="{domain/redshift/CoordSpace}" alt="" coords="8113,827,8257,877"/>
-<area shape="rect" id="node161" href="#domain.redshift.DerivedRedshiftCoordinate" title="{domain/redshift/DerivedRedshiftCoordinate|+coord : stc2:domain.redshift.RedshiftCoord\l}" alt="" coords="20825,677,21039,726"/>
-<area shape="rect" id="node162" href="#domain.redshift.Uncertainty" title="{domain/redshift/Uncertainty|+flavor : ivoa:string\l}" alt="" coords="20503,827,20644,877"/>
-<area shape="rect" id="node163" href="#domain.redshift.Bounds" title="{domain/redshift/Bounds|+hiLimit : stc2:domain.redshift.RedshiftCoord\l+loLimit : stc2:domain.redshift.RedshiftCoord\l}" alt="" coords="20100,670,20321,733"/>
-<area shape="rect" id="node164" href="#domain.redshift.SymmetricInterval" title="{domain/redshift/SymmetricInterval|+center : stc2:domain.redshift.RedshiftCoord\l+size : ivoa:RealQuantity\l}" alt="" coords="20345,670,20561,733"/>
-<area shape="rect" id="node165" href="#domain.redshift.AssymetricInterval" title="{domain/redshift/AssymetricInterval|+center : stc2:domain.redshift.RedshiftCoord\l+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="20585,663,20801,739"/>
-<area shape="rect" id="node166" href="#domain.redshift.DopplerVelocity" title="{domain/redshift/DopplerVelocity}" alt="" coords="20765,273,20928,322"/>
-<area shape="rect" id="node167" href="#domain.redshift.Redshift" title="{domain/redshift/Redshift}" alt="" coords="20952,273,21080,322"/>
-<area shape="rect" id="node169" href="#domain.redshift.Cartesian" title="{domain/redshift/Cartesian}" alt="" coords="8308,677,8441,726"/>
-<area shape="rect" id="node170" href="#domain.redshift.RedshiftSpace" title="{domain/redshift/RedshiftSpace}" alt="" coords="8385,273,8540,322"/>
-<area shape="rect" id="node171" href="#domain.polarization.PolStokes" title="{<<enumeration>>\ldomain/polarization/PolStokes|+I\l+Q\l+U\l+V\l}" alt="" coords="21104,246,21256,349"/>
-<area shape="rect" id="node172" href="#domain.polarization.PolCircular" title="{<<enumeration>>\ldomain/polarization/PolCircular|+RR\l+LL\l+RL\l+LR\l}" alt="" coords="21280,246,21440,349"/>
-<area shape="rect" id="node173" href="#domain.polarization.PolLinear" title="{<<enumeration>>\ldomain/polarization/PolLinear|+XX\l+YY\l+XY\l+YX\l}" alt="" coords="21464,246,21616,349"/>
-<area shape="rect" id="node174" href="#domain.polarization.PolVector" title="{<<enumeration>>\ldomain/polarization/PolVector|+I\l+PF\l+PP\l+PA\l}" alt="" coords="21640,246,21795,349"/>
-<area shape="rect" id="node175" href="#domain.polarization.PolStokesCoord" title="{<<datatype>>\ndomain/polarization/PolStokesCoord}" alt="" coords="21819,273,21997,322"/>
-<area shape="rect" id="node179" href="#domain.polarization.PolCoord" title="{<<datatype>>\ndomain/polarization/PolCoord}" alt="" coords="22143,677,22292,726"/>
-<area shape="rect" id="node176" href="#domain.polarization.PolCircularCoord" title="{<<datatype>>\ndomain/polarization/PolCircularCoord}" alt="" coords="22021,273,22208,322"/>
-<area shape="rect" id="node177" href="#domain.polarization.PolLinearCoord" title="{<<datatype>>\ndomain/polarization/PolLinearCoord}" alt="" coords="22232,273,22411,322"/>
-<area shape="rect" id="node178" href="#domain.polarization.PolVectorCoord" title="{<<datatype>>\ndomain/polarization/PolVectorCoord}" alt="" coords="22435,273,22613,322"/>
-<area shape="rect" id="node180" href="#domain.polarization.PolBasis" title="{domain/polarization/PolBasis}" alt="" coords="6436,827,6583,877"/>
-<area shape="rect" id="node181" href="#domain.polarization.StdPolBasis" title="{domain/polarization/StdPolBasis}" alt="" coords="6559,677,6719,726"/>
-<area shape="rect" id="node182" href="#domain.polarization.PolStokesBasis" title="{domain/polarization/PolStokesBasis}" alt="" coords="6652,273,6825,322"/>
-<area shape="rect" id="node183" href="#domain.polarization.PolCircularBasis" title="{domain/polarization/PolCircularBasis}" alt="" coords="6849,273,7031,322"/>
-<area shape="rect" id="node184" href="#domain.polarization.PolLinearBasis" title="{domain/polarization/PolLinearBasis}" alt="" coords="6252,273,6428,322"/>
-<area shape="rect" id="node185" href="#domain.polarization.PolVectorBasis" title="{domain/polarization/PolVectorBasis}" alt="" coords="6452,273,6628,322"/>
-<area shape="rect" id="node187" href="#domain.polarization.CoordSpace" title="{domain/polarization/CoordSpace}" alt="" coords="8532,827,8695,877"/>
-<area shape="rect" id="node190" href="#domain.polarization.DiscreteAxis" title="{domain/polarization/DiscreteAxis}" alt="" coords="9031,965,9196,1014"/>
-<area shape="rect" id="node188" href="#domain.polarization.PolSpace" title="{domain/polarization/PolSpace}" alt="" coords="8957,273,9107,322"/>
-<area shape="rect" id="node189" href="#domain.polarization.Cartesian" title="{domain/polarization/Cartesian}" alt="" coords="8768,677,8917,726"/>
-<area shape="rect" id="node191" href="#domain.polarization.AssociatedStokesPol" title="{domain/polarization/AssociatedStokesPol|+loc : stc2:domain.polarization.PolStokes\l}" alt="" coords="9220,827,9420,877"/>
-<area shape="rect" id="node192" href="#domain.polarization.AssociatedCircularPol" title="{domain/polarization/AssociatedCircularPol|+loc : stc2:domain.polarization.PolCircular\l}" alt="" coords="9444,827,9652,877"/>
-<area shape="rect" id="node193" href="#domain.polarization.AssociatedLinearPol" title="{domain/polarization/AssociatedLinearPol|+loc : stc2:domain.polarization.PolLinear\l}" alt="" coords="8719,827,8919,877"/>
-<area shape="rect" id="node194" href="#domain.polarization.AssociatedVectorPol" title="{domain/polarization/AssociatedVectorPol|+loc : stc2:domain.polarization.PolVector\l}" alt="" coords="8943,827,9145,877"/>
-<area shape="rect" id="node195" href="#domain.polarization.DerivedPolarizationCoordinate" title="{domain/polarization/DerivedPolarizationCoordinate}" alt="" coords="23033,677,23276,726"/>
-<area shape="rect" id="node196" href="#domain.polarization.Stokes" title="{domain/polarization/Stokes|+coord : stc2:domain.polarization.PolStokesCoord\l}" alt="" coords="22637,273,22875,322"/>
-<area shape="rect" id="node197" href="#domain.polarization.Circular" title="{domain/polarization/Circular|+coord : stc2:domain.polarization.PolCircularCoord\l}" alt="" coords="22899,273,23144,322"/>
-<area shape="rect" id="node198" href="#domain.polarization.Linear" title="{domain/polarization/Linear|+coord : stc2:domain.polarization.PolLinearCoord\l}" alt="" coords="23168,273,23405,322"/>
-<area shape="rect" id="node199" href="#domain.polarization.Vector" title="{domain/polarization/Vector|+coord : stc2:domain.polarization.PolVectorCoord\l}" alt="" coords="23429,273,23667,322"/>
+<area shape="rect" id="node17" href="#stctypes.Handedness" title="{<<enumeration>>\lstctypes/Handedness|+left\l+right\l}" alt="" coords="2233,259,2343,335"/>
+<area shape="rect" id="node18" href="#frametransforms.Projection" title="{<<enumeration>>\lframetransforms/Projection|+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="3423,126,3564,469"/>
+<area shape="rect" id="node19" href="#frametransforms.TPolarization" title="{frametransforms/TPolarization}" alt="" coords="8832,677,8987,726"/>
+<area shape="rect" id="node33" href="#frametransforms.TLookup" title="{frametransforms/TLookup|+nvals : ivoa:nonnegativeInteger\l}" alt="" coords="5467,827,5629,877"/>
+<area shape="rect" id="node38" href="#frametransforms.TPolarizationEntry" title="{frametransforms/TPolarizationEntry}" alt="" coords="9672,827,9851,877"/>
+<area shape="rect" id="node20" href="#frametransforms.TPolStokes" title="{frametransforms/TPolStokes|+nativeValue : ivoa:integer\l+polType : stc2:domain.polarization.PolStokes\l}" alt="" coords="9405,670,9627,733"/>
+<area shape="rect" id="node21" href="#frametransforms.TPolLinear" title="{frametransforms/TPolLinear|+nativeValue : ivoa:integer\l+polType : stc2:domain.polarization.PolLinear\l}" alt="" coords="9651,670,9872,733"/>
+<area shape="rect" id="node22" href="#frametransforms.TPolCircular" title="{frametransforms/TPolCircular|+nativeValue : ivoa:integer\l+polType : stc2:domain.polarization.PolCircular\l}" alt="" coords="9896,670,10125,733"/>
+<area shape="rect" id="node23" href="#frametransforms.TPolVector" title="{frametransforms/TPolVector|+nativeValue : ivoa:integer\l+polType : stc2:domain.polarization.PolVector\l}" alt="" coords="10149,670,10373,733"/>
+<area shape="rect" id="node24" href="#frametransforms.TUnit" title="{frametransforms/TUnit}" alt="" coords="1884,827,2007,877"/>
+<area shape="rect" id="node40" href="#frametransforms.Transform" title="{frametransforms/Transform}" alt="" coords="2188,965,2329,1014"/>
+<area shape="rect" id="node25" href="#frametransforms.TShift1D" title="{frametransforms/TShift1D|+shift : ivoa:real\l}" alt="" coords="2511,827,2649,877"/>
+<area shape="rect" id="node26" href="#frametransforms.TShift2D" title="{frametransforms/TShift2D|+shift : ivoa:real\l}" alt="" coords="2673,827,2812,877"/>
+<area shape="rect" id="node27" href="#frametransforms.TScale1D" title="{frametransforms/TScale1D|+factor : ivoa:real\l}" alt="" coords="1052,827,1193,877"/>
+<area shape="rect" id="node28" href="#frametransforms.TScale2D" title="{frametransforms/TScale2D|+factor : ivoa:real\l}" alt="" coords="1217,827,1359,877"/>
+<area shape="rect" id="node29" href="#frametransforms.TRotate2D" title="{frametransforms/TRotate2D|+angle : ivoa:real\l}" alt="" coords="1383,827,1527,877"/>
+<area shape="rect" id="node30" href="#frametransforms.TMatrix" title="{frametransforms/TMatrix|+matrix : stc2:stctypes.Matrix\l}" alt="" coords="1711,827,1860,877"/>
+<area shape="rect" id="node31" href="#frametransforms.TPolynomial" title="{frametransforms/TPolynomial|+order : ivoa:nonnegativeInteger\l}" alt="" coords="3153,827,3316,877"/>
+<area shape="rect" id="node39" href="#frametransforms.TPolyCoeff" title="{frametransforms/TPolyCoeff|+coeff : ivoa:real\l+power : ivoa:real\l}" alt="" coords="3163,958,3309,1021"/>
+<area shape="rect" id="node32" href="#frametransforms.TProjection1D" title="{frametransforms/TProjection1D|+algorithm : stc2:frametransforms.Projection\l+nativeRefValue : ivoa:real\l+targetRefValue : ivoa:real\l}" alt="" coords="2031,814,2247,890"/>
+<area shape="rect" id="node34" href="#frametransforms.TLookupMap" title="{frametransforms/TLookupMap}" alt="" coords="8653,677,8808,726"/>
+<area shape="rect" id="node35" href="#frametransforms.TLookupEntry" title="{frametransforms/TLookupEntry}" alt="" coords="9155,827,9315,877"/>
+<area shape="rect" id="node36" href="#frametransforms.TLookupEntry1D" title="{frametransforms/TLookupEntry1D|+nativeValue : ivoa:real\l+targetValue : ivoa:real\l}" alt="" coords="9011,670,9184,733"/>
+<area shape="rect" id="node37" href="#frametransforms.TLookupEntry2D" title="{frametransforms/TLookupEntry2D|+nativeValue : ivoa:real\l+targetValue : ivoa:real\l}" alt="" coords="9208,670,9381,733"/>
+<area shape="rect" id="node41" href="#frametransforms.Mappings" title="{frametransforms/Mappings}" alt="" coords="4988,677,5127,726"/>
+<area shape="rect" id="node43" href="#frametransforms.FrameTransform" title="{frametransforms/FrameTransform}" alt="" coords="5096,827,5267,877"/>
+<area shape="rect" id="node42" href="#frametransforms.TProjection2D" title="{frametransforms/TProjection2D|+algorithm : stc2:frametransforms.Projection\l+nativeRefValue : ivoa:real\l+targetRefValue : ivoa:real\l}" alt="" coords="2271,814,2487,890"/>
+<area shape="rect" id="node46" href="#coordsystem.CoordFrame" title="{coordsystem/CoordFrame}" alt="" coords="5212,965,5343,1014"/>
+<area shape="rect" id="node44" href="#coordsystem.CoordSys" title="{coordsystem/CoordSys}" alt="" coords="5407,677,5524,726"/>
+<area shape="rect" id="node66" href="#domain.generic.GenericFrame" title="{domain/generic/GenericFrame}" alt="" coords="5653,827,5808,877"/>
+<area shape="rect" id="node45" href="#coordsystem.AstroCoordSystem" title="{coordsystem/AstroCoordSystem|+planetaryEphemeris : ivoa:string\l}" alt="" coords="5563,273,5731,322"/>
+<area shape="rect" id="node94" href="#domain.spatial.SpaceFrame" title="{domain/spatial/SpaceFrame}" alt="" coords="4609,677,4751,726"/>
+<area shape="rect" id="node125" href="#domain.temporal.TimeFrame" title="{domain/temporal/TimeFrame}" alt="" coords="6215,677,6361,726"/>
+<area shape="rect" id="node139" href="#domain.spectral.SpectralFrame" title="{domain/spectral/SpectralFrame}" alt="" coords="5855,677,6012,726"/>
+<area shape="rect" id="node159" href="#domain.redshift.RedshiftFrame" title="{domain/redshift/RedshiftFrame}" alt="" coords="6036,677,6191,726"/>
+<area shape="rect" id="node190" href="#domain.polarization.PolarizationFrame" title="{domain/polarization/PolarizationFrame}" alt="" coords="4775,677,4964,726"/>
+<area shape="rect" id="node47" href="#coordsystem.PixelCoordSystem" title="{coordsystem/PixelCoordSystem}" alt="" coords="2823,677,2980,726"/>
+<area shape="rect" id="node55" href="#domain.pixel.PixelFrame" title="{domain/pixel/PixelFrame}" alt="" coords="2836,827,2967,877"/>
+<area shape="rect" id="node48" href="#domain.pixel.PixelCoord" title="{<<datatype>>\ndomain/pixel/PixelCoord}" alt="" coords="10397,677,10525,726"/>
+<area shape="rect" id="node49" href="#domain.pixel.PixelCoord1D" title="{<<datatype>>\ndomain/pixel/PixelCoord1D|+elem : stc2:domain.pixel.AssociatedValue\l}" alt="" coords="10125,266,10333,329"/>
+<area shape="rect" id="node50" href="#domain.pixel.PixelCoord2D" title="{<<datatype>>\ndomain/pixel/PixelCoord2D|+elem : stc2:domain.pixel.AssociatedValue\l}" alt="" coords="10357,266,10565,329"/>
+<area shape="rect" id="node51" href="#domain.pixel.PixellCoord3D" title="{<<datatype>>\ndomain/pixel/PixellCoord3D|+elem : stc2:domain.pixel.AssociatedValue\l}" alt="" coords="10589,266,10797,329"/>
+<area shape="rect" id="node52" href="#domain.pixel.AssociatedValue" title="{<<datatype>>\ndomain/pixel/AssociatedValue|+loc : ivoa:RealQuantity\l}" alt="" coords="2987,958,3139,1021"/>
+<area shape="rect" id="node57" href="#domain.pixel.PixelAxis" title="{domain/pixel/PixelAxis|+length : ivoa:nonnegativeInteger\l}" alt="" coords="2604,1095,2769,1145"/>
+<area shape="rect" id="node53" href="#domain.pixel.PixelBasis" title="{domain/pixel/PixelBasis}" alt="" coords="2837,965,2963,1014"/>
+<area shape="rect" id="node54" href="#domain.pixel.StdPixelBasis" title="{domain/pixel/StdPixelBasis}" alt="" coords="2991,827,3129,877"/>
+<area shape="rect" id="node56" href="#domain.pixel.PixelSpace" title="{domain/pixel/PixelSpace}" alt="" coords="1547,965,1675,1014"/>
+<area shape="rect" id="node58" href="#domain.pixel.Pixel" title="{domain/pixel/Pixel}" alt="" coords="11095,677,11196,726"/>
+<area shape="rect" id="node59" href="#domain.pixel.Pixel1D" title="{domain/pixel/Pixel1D|+coord : stc2:domain.pixel.PixelCoord1D\l}" alt="" coords="10821,273,11021,322"/>
+<area shape="rect" id="node60" href="#domain.pixel.Pixel2D" title="{domain/pixel/Pixel2D|+coord : stc2:domain.pixel.PixelCoord2D\l}" alt="" coords="11045,273,11245,322"/>
+<area shape="rect" id="node61" href="#domain.pixel.Pixel3D" title="{domain/pixel/Pixel3D|+coord : stc2:domain.pixel.PixellCoord3D\l}" alt="" coords="11269,273,11472,322"/>
+<area shape="rect" id="node62" href="#domain.generic.GenericCoord" title="{<<datatype>>\ndomain/generic/GenericCoord|+elem : stc2:domain.generic.AssociatedValue\l}" alt="" coords="11496,266,11715,329"/>
+<area shape="rect" id="node63" href="#domain.generic.AssociatedValue" title="{<<datatype>>\ndomain/generic/AssociatedValue|+loc : ivoa:RealQuantity\l}" alt="" coords="6392,958,6555,1021"/>
+<area shape="rect" id="node67" href="#domain.generic.CoordAxis" title="{domain/generic/CoordAxis|+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="6277,1089,6443,1151"/>
+<area shape="rect" id="node64" href="#domain.generic.GenericBasis" title="{domain/generic/GenericBasis}" alt="" coords="4927,965,5076,1014"/>
+<area shape="rect" id="node65" href="#domain.generic.StdGenericBasis" title="{domain/generic/StdGenericBasis}" alt="" coords="4808,827,4971,877"/>
+<area shape="rect" id="node68" href="#domain.generic.CoordSpace" title="{domain/generic/CoordSpace}" alt="" coords="6171,965,6312,1014"/>
+<area shape="rect" id="node69" href="#domain.generic.Cartesian" title="{domain/generic/Cartesian}" alt="" coords="6260,827,6391,877"/>
+<area shape="rect" id="node70" href="#domain.generic.Measurement" title="{domain/generic/Measurement|+coord : stc2:domain.generic.GenericCoord\l}" alt="" coords="11739,273,11949,322"/>
+<area shape="rect" id="node71" href="#domain.generic.Uncertainty" title="{domain/generic/Uncertainty|+flavor : ivoa:string\l}" alt="" coords="12132,677,12273,726"/>
+<area shape="rect" id="node72" href="#domain.generic.Bounds" title="{domain/generic/Bounds|+hiLimit : stc2:domain.generic.GenericCoord\l+loLimit : stc2:domain.generic.GenericCoord\l}" alt="" coords="11973,266,12192,329"/>
+<area shape="rect" id="node73" href="#domain.generic.SymmetricInterval" title="{domain/generic/SymmetricInterval|+center : stc2:domain.generic.GenericCoord\l+size : ivoa:RealQuantity\l}" alt="" coords="12216,266,12429,329"/>
+<area shape="rect" id="node74" href="#domain.generic.AssymetricInterval" title="{domain/generic/AssymetricInterval|+center : stc2:domain.generic.GenericCoord\l+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="12453,259,12667,335"/>
+<area shape="rect" id="node75" href="#domain.spatial.EpochType" title="{<<enumeration>>\ldomain/spatial/EpochType|+J\l+B\l}" alt="" coords="12691,259,12827,335"/>
+<area shape="rect" id="node76" href="#domain.spatial.StdRefPosition" title="{<<enumeration>>\ldomain/spatial/StdRefPosition|+TOPOCENTER\l+BARYCENTER\l+HELIOCENTER\l+GEOCENTER\l+GALACTIC_CENTER\l+LOCAL_GROUP_CENTER\l+MOON\l+EMBARYCENTER\l+MERCURY\l+VENUS\l+MARS\l+JUPITER\l+SATURN\l+URANUS\l+NEPTUNE\l+PLUTO\l+RELOCATABLE\l+LSR\l+LSRK\l+LSRD\l+UNKNOWN\l+CUSTOM\l}" alt="" coords="12851,126,13005,469"/>
+<area shape="rect" id="node77" href="#domain.spatial.StdRefFrame" title="{<<enumeration>>\ldomain/spatial/StdRefFrame|+ICRS\l+FK4\l+FK5\l+ECLIPTIC\l+GALACTIC_I\l+GALACTIC_II\l+SUPER_GALACTIC\l+AZ_EL\l+BODY\l+GEO_C\l+GEO_D\l+MAG\l+GSE\l+GSM\l+SM\l+HGC\l+HEE\l+HEEQ\l+HCI\l+HCD\l+MERCURY_C\l+VENUS_C\l+LUNA_C\l+MARS_C\l+JUPITER_C_III\l+SATURN_C_III\l+URANUS_C_III\l+NEPTUNE_C_III\l+PLUTO_C\l+MERCURY_G\l+VENUS_G\l+LUNA_G\l+MARS_G\l+JUPITER_G_III\l+SATURN_G_III\l+URANUS_G_III\l+NEPTUNE_G_III\l+PLUTO_G\l+UNKNOWN\l+CUSTOM\l}" alt="" coords="13029,6,13173,589"/>
+<area shape="rect" id="node78" href="#domain.spatial.SpatialCoord" title="{<<datatype>>\ndomain/spatial/SpatialCoord}" alt="" coords="13475,677,13616,726"/>
+<area shape="rect" id="node79" href="#domain.spatial.SpatialCoord1D" title="{<<datatype>>\ndomain/spatial/SpatialCoord1D|+elem : stc2:domain.spatial.AssociatedValue\l}" alt="" coords="13197,266,13413,329"/>
+<area shape="rect" id="node80" href="#domain.spatial.SpatialCoord2D" title="{<<datatype>>\ndomain/spatial/SpatialCoord2D|+elem : stc2:domain.spatial.AssociatedValue\l}" alt="" coords="13437,266,13653,329"/>
+<area shape="rect" id="node81" href="#domain.spatial.SpatialCoord3D" title="{<<datatype>>\ndomain/spatial/SpatialCoord3D|+elem : stc2:domain.spatial.AssociatedValue\l}" alt="" coords="13677,266,13893,329"/>
+<area shape="rect" id="node82" href="#domain.spatial.Epoch" title="{<<datatype>>\ndomain/spatial/Epoch|+type : stc2:domain.spatial.EpochType\l+year : ivoa:real\l}" alt="" coords="13917,259,14107,335"/>
+<area shape="rect" id="node83" href="#domain.spatial.AssociatedValue" title="{<<datatype>>\ndomain/spatial/AssociatedValue|+loc : ivoa:RealQuantity\l}" alt="" coords="4624,821,4784,883"/>
+<area shape="rect" id="node95" href="#domain.spatial.CoordAxis" title="{domain/spatial/CoordAxis|+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="3744,958,3909,1021"/>
+<area shape="rect" id="node84" href="#domain.spatial.SpaceBasis" title="{domain/spatial/SpaceBasis}" alt="" coords="1551,827,1687,877"/>
+<area shape="rect" id="node85" href="#domain.spatial.StdSpaceBasis" title="{domain/spatial/StdSpaceBasis|+origin : stc2:domain.spatial.StdRefPosition\l+orientation : stc2:domain.spatial.StdRefFrame\l+equinox : stc2:domain.spatial.Epoch\l}" alt="" coords="1700,663,1927,739"/>
+<area shape="rect" id="node86" href="#domain.spatial.CustomSpaceBasis" title="{domain/spatial/CustomSpaceBasis|+origin : stc2:domain.spatial.SpatialCoord\l}" alt="" coords="1473,677,1676,726"/>
+<area shape="rect" id="node87" href="#domain.spatial.CoordSpace" title="{domain/spatial/CoordSpace}" alt="" coords="3965,827,4104,877"/>
+<area shape="rect" id="node88" href="#domain.spatial.Spherical" title="{domain/spatial/Spherical}" alt="" coords="4085,677,4213,726"/>
+<area shape="rect" id="node89" href="#domain.spatial.Polar" title="{domain/spatial/Polar}" alt="" coords="4292,677,4401,726"/>
+<area shape="rect" id="node90" href="#domain.spatial.Cylindrical" title="{domain/spatial/Cylindrical}" alt="" coords="3673,677,3807,726"/>
+<area shape="rect" id="node91" href="#domain.spatial.Cartesian" title="{domain/spatial/Cartesian}" alt="" coords="3517,677,3645,726"/>
+<area shape="rect" id="node92" href="#domain.spatial.UnitSphere" title="{domain/spatial/UnitSphere}" alt="" coords="3352,677,3488,726"/>
+<area shape="rect" id="node93" href="#domain.spatial.HealPix" title="{domain/spatial/HealPix|+scheme : ivoa:string\l}" alt="" coords="3833,677,3956,726"/>
+<area shape="rect" id="node96" href="#domain.spatial.Position" title="{domain/spatial/Position}" alt="" coords="15145,677,15265,726"/>
+<area shape="rect" id="node97" href="#domain.spatial.Position1D" title="{domain/spatial/Position1D|+coord : stc2:domain.spatial.SpatialCoord1D\l}" alt="" coords="14861,273,15075,322"/>
+<area shape="rect" id="node100" href="#domain.spatial.Uncertainty1D" title="{domain/spatial/Uncertainty1D|+flavor : ivoa:string\l}" alt="" coords="14529,677,14679,726"/>
+<area shape="rect" id="node98" href="#domain.spatial.Position2D" title="{domain/spatial/Position2D|+coord : stc2:domain.spatial.SpatialCoord2D\l}" alt="" coords="15099,273,15312,322"/>
+<area shape="rect" id="node104" href="#domain.spatial.Uncertainty2D" title="{domain/spatial/Uncertainty2D|+flavor : ivoa:string\l}" alt="" coords="15737,677,15887,726"/>
+<area shape="rect" id="node99" href="#domain.spatial.Position3D" title="{domain/spatial/Position3D|+coord : stc2:domain.spatial.SpatialCoord3D\l}" alt="" coords="16309,273,16523,322"/>
+<area shape="rect" id="node110" href="#domain.spatial.Uncertainty3D" title="{domain/spatial/Uncertainty3D|+flavor : ivoa:string\l}" alt="" coords="17137,677,17287,726"/>
+<area shape="rect" id="node101" href="#domain.spatial.Bounds1D" title="{domain/spatial/Bounds1D|+hiLimit : stc2:domain.spatial.SpatialCoord1D\l+loLimit : stc2:domain.spatial.SpatialCoord1D\l}" alt="" coords="14616,266,14837,329"/>
+<area shape="rect" id="node102" href="#domain.spatial.SymmetricInterval" title="{domain/spatial/SymmetricInterval|+center : stc2:domain.spatial.SpatialCoord1D\l+size : ivoa:RealQuantity\l}" alt="" coords="14131,266,14349,329"/>
+<area shape="rect" id="node103" href="#domain.spatial.AssymetricInterval" title="{domain/spatial/AssymetricInterval|+center : stc2:domain.spatial.SpatialCoord1D\l+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="14373,259,14592,335"/>
+<area shape="rect" id="node105" href="#domain.spatial.Bounds2D" title="{domain/spatial/Bounds2D|+hiLimit : stc2:domain.spatial.SpatialCoord2D\l+loLimit : stc2:domain.spatial.SpatialCoord2D\l}" alt="" coords="15336,266,15557,329"/>
+<area shape="rect" id="node106" href="#domain.spatial.Circle" title="{domain/spatial/Circle|+center : stc2:domain.spatial.SpatialCoord2D\l+radius : ivoa:RealQuantity\l}" alt="" coords="15581,266,15800,329"/>
+<area shape="rect" id="node107" href="#domain.spatial.Rectangle" title="{domain/spatial/Rectangle|+center : stc2:domain.spatial.SpatialCoord2D\l+length : ivoa:RealQuantity\l+width : ivoa:RealQuantity\l}" alt="" coords="15824,259,16043,335"/>
+<area shape="rect" id="node108" href="#domain.spatial.Ellipse" title="{domain/spatial/Ellipse|+center : stc2:domain.spatial.SpatialCoord2D\l+semiAxes : ivoa:RealQuantity\l+rotation : ivoa:RealQuantity\l}" alt="" coords="16067,259,16285,335"/>
+<area shape="rect" id="node109" href="#domain.spatial.ErrorMatrix2x2" title="{domain/spatial/ErrorMatrix2x2|+matrix : stc2:stctypes.Matrix2x2\l}" alt="" coords="16547,273,16712,322"/>
+<area shape="rect" id="node111" href="#domain.spatial.Bounds3D" title="{domain/spatial/Bounds3D|+hiLimit : stc2:domain.spatial.SpatialCoord3D\l+loLimit : stc2:domain.spatial.SpatialCoord3D\l}" alt="" coords="16736,266,16957,329"/>
+<area shape="rect" id="node112" href="#domain.spatial.Sphere" title="{domain/spatial/Sphere|+center : stc2:domain.spatial.SpatialCoord3D\l+radius : ivoa:RealQuantity\l}" alt="" coords="16981,266,17200,329"/>
+<area shape="rect" id="node113" href="#domain.spatial.Cube" title="{domain/spatial/Cube|+center : stc2:domain.spatial.SpatialCoord3D\l+length : ivoa:RealQuantity\l+width : ivoa:RealQuantity\l+height : ivoa:RealQuantity\l}" alt="" coords="17224,253,17443,342"/>
+<area shape="rect" id="node114" href="#domain.spatial.Ellipsoid" title="{domain/spatial/Ellipsoid|+center : stc2:domain.spatial.SpatialCoord3D\l+semiAxes : ivoa:RealQuantity\l+rotation : ivoa:RealQuantity\l}" alt="" coords="17467,259,17685,335"/>
+<area shape="rect" id="node115" href="#domain.spatial.ErrorMatrix3x3" title="{domain/spatial/ErrorMatrix3x3|+matrix : stc2:stctypes.Matrix3x3\l}" alt="" coords="17709,273,17875,322"/>
+<area shape="rect" id="node116" href="#domain.temporal.Calendar" title="{<<enumeration>>\ldomain/temporal/Calendar|+Gregorian\l+Julian\l+Roman\l}" alt="" coords="17899,253,18035,342"/>
+<area shape="rect" id="node117" href="#domain.temporal.TimeScale" title="{<<enumeration>>\ldomain/temporal/TimeScale|+TT\l+ET\l+TDB\l+TCG\l+TCB\l+TAI\l+UTC\l+LST\l+LOCAL\l}" alt="" coords="18059,213,18203,382"/>
+<area shape="rect" id="node118" href="#domain.temporal.TimeCoord" title="{<<datatype>>\ndomain/temporal/TimeCoord|+elem : stc2:domain.temporal.AssociatedValue\l}" alt="" coords="18227,266,18453,329"/>
+<area shape="rect" id="node119" href="#domain.temporal.TimeOffset" title="{<<datatype>>\ndomain/temporal/TimeOffset|+loc : ivoa:RealQuantity\l}" alt="" coords="7316,670,7463,733"/>
+<area shape="rect" id="node121" href="#domain.temporal.AssociatedValue" title="{<<datatype>>\ndomain/temporal/AssociatedValue}" alt="" coords="7307,827,7477,877"/>
+<area shape="rect" id="node120" href="#domain.temporal.TimeInstant" title="{<<datatype>>\ndomain/temporal/TimeInstant|+loc : ivoa:datetime\l}" alt="" coords="7487,670,7636,733"/>
+<area shape="rect" id="node129" href="#domain.temporal.CoordAxis" title="{domain/temporal/CoordAxis|+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="7187,958,7352,1021"/>
+<area shape="rect" id="node122" href="#domain.temporal.TimeBasis" title="{domain/temporal/TimeBasis}" alt="" coords="6849,827,6991,877"/>
+<area shape="rect" id="node123" href="#domain.temporal.StdTimeBasis" title="{domain/temporal/StdTimeBasis|+origin : stc2:domain.temporal.Calendar\l+timescale : stc2:domain.temporal.TimeScale\l+refPosition : stc2:domain.spatial.StdRefPosition\l+refDirection : stc2:domain.spatial.SpatialCoord\l}" alt="" coords="6543,657,6775,746"/>
+<area shape="rect" id="node124" href="#domain.temporal.CustomTimeBasis" title="{domain/temporal/CustomTimeBasis|+offset : stc2:domain.temporal.TimeOffset\l+refPosition : stc2:domain.spatial.SpatialCoord\l}" alt="" coords="6849,670,7073,733"/>
+<area shape="rect" id="node126" href="#domain.temporal.CoordSpace" title="{domain/temporal/CoordSpace}" alt="" coords="7083,827,7232,877"/>
+<area shape="rect" id="node127" href="#domain.temporal.Cartesian" title="{domain/temporal/Cartesian}" alt="" coords="7097,677,7236,726"/>
+<area shape="rect" id="node128" href="#domain.temporal.TimeSpace" title="{domain/temporal/TimeSpace}" alt="" coords="7165,273,7312,322"/>
+<area shape="rect" id="node130" href="#domain.temporal.Time" title="{domain/temporal/Time|+coord : stc2:domain.temporal.TimeCoord\l}" alt="" coords="18477,273,18683,322"/>
+<area shape="rect" id="node131" href="#domain.temporal.Uncertainty" title="{domain/temporal/Uncertainty|+flavor : ivoa:string\l}" alt="" coords="18844,677,18991,726"/>
+<area shape="rect" id="node132" href="#domain.temporal.Bounds" title="{domain/temporal/Bounds|+hiLimit : stc2:domain.temporal.TimeCoord\l+loLimit : stc2:domain.temporal.TimeCoord\l}" alt="" coords="18707,266,18920,329"/>
+<area shape="rect" id="node133" href="#domain.temporal.SymmetricInterval" title="{domain/temporal/SymmetricInterval|+center : stc2:domain.temporal.TimeCoord\l+size : ivoa:RealQuantity\l}" alt="" coords="18944,266,19152,329"/>
+<area shape="rect" id="node134" href="#domain.temporal.AssymetricInterval" title="{domain/temporal/AssymetricInterval|+center : stc2:domain.temporal.TimeCoord\l+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="19176,259,19384,335"/>
+<area shape="rect" id="node135" href="#domain.spectral.SpectralCoord" title="{<<datatype>>\ndomain/spectral/SpectralCoord|+elem : stc2:domain.spectral.AssociatedValue\l}" alt="" coords="19461,266,19683,329"/>
+<area shape="rect" id="node136" href="#domain.spectral.AssociatedValue" title="{<<datatype>>\ndomain/spectral/AssociatedValue|+loc : ivoa:RealQuantity\l}" alt="" coords="7669,821,7835,883"/>
+<area shape="rect" id="node140" href="#domain.spectral.CoordAxis" title="{domain/spectral/CoordAxis|+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="7789,958,7955,1021"/>
+<area shape="rect" id="node137" href="#domain.spectral.SpectralBasis" title="{domain/spectral/SpectralBasis}" alt="" coords="5291,827,5443,877"/>
+<area shape="rect" id="node138" href="#domain.spectral.StdSpectralBasis" title="{domain/spectral/StdSpectralBasis|+refPosition : stc2:domain.spatial.StdRefPosition\l}" alt="" coords="5151,677,5383,726"/>
+<area shape="rect" id="node141" href="#domain.spectral.CoordSpace" title="{domain/spectral/CoordSpace}" alt="" coords="7501,827,7645,877"/>
+<area shape="rect" id="node142" href="#domain.spectral.Cartesian" title="{domain/spectral/Cartesian}" alt="" coords="7752,677,7885,726"/>
+<area shape="rect" id="node143" href="#domain.spectral.EnergySpace" title="{domain/spectral/EnergySpace}" alt="" coords="7607,273,7756,322"/>
+<area shape="rect" id="node144" href="#domain.spectral.FrequencySpace" title="{domain/spectral/FrequencySpace}" alt="" coords="7780,273,7943,322"/>
+<area shape="rect" id="node145" href="#domain.spectral.WavelengthSpace" title="{domain/spectral/WavelengthSpace}" alt="" coords="7967,273,8137,322"/>
+<area shape="rect" id="node146" href="#domain.spectral.DerivedSpectralCoordinate" title="{domain/spectral/DerivedSpectralCoordinate|+coord : stc2:domain.spectral.SpectralCoord\l}" alt="" coords="19843,677,20056,726"/>
+<area shape="rect" id="node150" href="#domain.spectral.Uncertainty" title="{domain/spectral/Uncertainty|+flavor : ivoa:string\l}" alt="" coords="19519,827,19663,877"/>
+<area shape="rect" id="node147" href="#domain.spectral.Energy" title="{domain/spectral/Energy}" alt="" coords="19733,273,19856,322"/>
+<area shape="rect" id="node148" href="#domain.spectral.Frequency" title="{domain/spectral/Frequency}" alt="" coords="19880,273,20019,322"/>
+<area shape="rect" id="node149" href="#domain.spectral.Wavelength" title="{domain/spectral/Wavelength}" alt="" coords="20043,273,20187,322"/>
+<area shape="rect" id="node151" href="#domain.spectral.Bounds" title="{domain/spectral/Bounds|+hiLimit : stc2:domain.spectral.SpectralCoord\l+loLimit : stc2:domain.spectral.SpectralCoord\l}" alt="" coords="19117,670,19339,733"/>
+<area shape="rect" id="node152" href="#domain.spectral.SymmetricInterval" title="{domain/spectral/SymmetricInterval|+center : stc2:domain.spectral.SpectralCoord\l+size : ivoa:RealQuantity\l}" alt="" coords="19363,670,19579,733"/>
+<area shape="rect" id="node153" href="#domain.spectral.AssymetricInterval" title="{domain/spectral/AssymetricInterval|+center : stc2:domain.spectral.SpectralCoord\l+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="19603,663,19819,739"/>
+<area shape="rect" id="node154" href="#domain.redshift.DopplerDefinition" title="{<<enumeration>>\ldomain/redshift/DopplerDefinition|+optical\l+radio\l+relativistic\l+redshift\l}" alt="" coords="20233,246,20404,349"/>
+<area shape="rect" id="node155" href="#domain.redshift.RedshiftCoord" title="{<<datatype>>\ndomain/redshift/RedshiftCoord|+elem : stc2:domain.redshift.AssociatedValue\l}" alt="" coords="20517,266,20739,329"/>
+<area shape="rect" id="node156" href="#domain.redshift.AssociatedValue" title="{<<datatype>>\ndomain/redshift/AssociatedValue|+loc : ivoa:RealQuantity\l}" alt="" coords="6596,821,6761,883"/>
+<area shape="rect" id="node160" href="#domain.redshift.CoordAxis" title="{domain/redshift/CoordAxis|+domainMin : ivoa:RealQuantity\l+domainMax : ivoa:RealQuantity\l}" alt="" coords="6596,958,6761,1021"/>
+<area shape="rect" id="node157" href="#domain.redshift.RedshiftBasis" title="{domain/redshift/RedshiftBasis}" alt="" coords="5885,827,6035,877"/>
+<area shape="rect" id="node158" href="#domain.redshift.StdRedshiftBasis" title="{domain/redshift/StdRedshiftBasis|+refPosition : stc2:domain.spatial.StdRefPosition\l+dopplerDefinition : stc2:domain.redshift.DopplerDefinition\l}" alt="" coords="5548,670,5831,733"/>
+<area shape="rect" id="node168" href="#domain.redshift.CoordSpace" title="{domain/redshift/CoordSpace}" alt="" coords="6415,827,6559,877"/>
+<area shape="rect" id="node161" href="#domain.redshift.DerivedRedshiftCoordinate" title="{domain/redshift/DerivedRedshiftCoordinate|+coord : stc2:domain.redshift.RedshiftCoord\l}" alt="" coords="20805,677,21019,726"/>
+<area shape="rect" id="node162" href="#domain.redshift.Uncertainty" title="{domain/redshift/Uncertainty|+flavor : ivoa:string\l}" alt="" coords="20483,827,20624,877"/>
+<area shape="rect" id="node163" href="#domain.redshift.Bounds" title="{domain/redshift/Bounds|+hiLimit : stc2:domain.redshift.RedshiftCoord\l+loLimit : stc2:domain.redshift.RedshiftCoord\l}" alt="" coords="20080,670,20301,733"/>
+<area shape="rect" id="node164" href="#domain.redshift.SymmetricInterval" title="{domain/redshift/SymmetricInterval|+center : stc2:domain.redshift.RedshiftCoord\l+size : ivoa:RealQuantity\l}" alt="" coords="20325,670,20541,733"/>
+<area shape="rect" id="node165" href="#domain.redshift.AssymetricInterval" title="{domain/redshift/AssymetricInterval|+center : stc2:domain.redshift.RedshiftCoord\l+plus : ivoa:RealQuantity\l+minus : ivoa:RealQuantity\l}" alt="" coords="20565,663,20781,739"/>
+<area shape="rect" id="node166" href="#domain.redshift.DopplerVelocity" title="{domain/redshift/DopplerVelocity}" alt="" coords="20808,273,20971,322"/>
+<area shape="rect" id="node167" href="#domain.redshift.Redshift" title="{domain/redshift/Redshift}" alt="" coords="20995,273,21123,322"/>
+<area shape="rect" id="node169" href="#domain.redshift.Cartesian" title="{domain/redshift/Cartesian}" alt="" coords="6385,677,6519,726"/>
+<area shape="rect" id="node170" href="#domain.redshift.RedshiftSpace" title="{domain/redshift/RedshiftSpace}" alt="" coords="6555,273,6709,322"/>
+<area shape="rect" id="node171" href="#domain.polarization.PolStokes" title="{<<enumeration>>\ldomain/polarization/PolStokes|+I\l+Q\l+U\l+V\l}" alt="" coords="21147,246,21299,349"/>
+<area shape="rect" id="node172" href="#domain.polarization.PolCircular" title="{<<enumeration>>\ldomain/polarization/PolCircular|+RR\l+LL\l+RL\l+LR\l}" alt="" coords="21323,246,21483,349"/>
+<area shape="rect" id="node173" href="#domain.polarization.PolLinear" title="{<<enumeration>>\ldomain/polarization/PolLinear|+XX\l+YY\l+XY\l+YX\l}" alt="" coords="21507,246,21659,349"/>
+<area shape="rect" id="node174" href="#domain.polarization.PolVector" title="{<<enumeration>>\ldomain/polarization/PolVector|+I\l+PF\l+PP\l+PA\l}" alt="" coords="21683,246,21837,349"/>
+<area shape="rect" id="node175" href="#domain.polarization.PolStokesCoord" title="{<<datatype>>\ndomain/polarization/PolStokesCoord|+elem : stc2:domain.polarization.AssociatedStokesPol\l}" alt="" coords="21861,266,22115,329"/>
+<area shape="rect" id="node179" href="#domain.polarization.PolCoord" title="{<<datatype>>\ndomain/polarization/PolCoord}" alt="" coords="22336,677,22485,726"/>
+<area shape="rect" id="node176" href="#domain.polarization.PolCircularCoord" title="{<<datatype>>\ndomain/polarization/PolCircularCoord|+elem : stc2:domain.polarization.AssociatedCircularPol\l}" alt="" coords="22139,266,22400,329"/>
+<area shape="rect" id="node177" href="#domain.polarization.PolLinearCoord" title="{<<datatype>>\ndomain/polarization/PolLinearCoord|+elem : stc2:domain.polarization.AssociatedLinearPol\l}" alt="" coords="22424,266,22680,329"/>
+<area shape="rect" id="node178" href="#domain.polarization.PolVectorCoord" title="{<<datatype>>\ndomain/polarization/PolVectorCoord|+elem : stc2:domain.polarization.AssociatedVectorPol\l}" alt="" coords="22704,266,22960,329"/>
+<area shape="rect" id="node180" href="#domain.polarization.AssociatedStokesPol" title="{<<datatype>>\ndomain/polarization/AssociatedStokesPol|+loc : stc2:domain.polarization.PolStokes\l}" alt="" coords="8931,821,9131,883"/>
+<area shape="rect" id="node194" href="#domain.polarization.DiscreteAxis" title="{domain/polarization/DiscreteAxis}" alt="" coords="8428,965,8593,1014"/>
+<area shape="rect" id="node181" href="#domain.polarization.AssociatedCircularPol" title="{<<datatype>>\ndomain/polarization/AssociatedCircularPol|+loc : stc2:domain.polarization.PolCircular\l}" alt="" coords="8197,821,8405,883"/>
+<area shape="rect" id="node182" href="#domain.polarization.AssociatedLinearPol" title="{<<datatype>>\ndomain/polarization/AssociatedLinearPol|+loc : stc2:domain.polarization.PolLinear\l}" alt="" coords="8480,821,8680,883"/>
+<area shape="rect" id="node183" href="#domain.polarization.AssociatedVectorPol" title="{<<datatype>>\ndomain/polarization/AssociatedVectorPol|+loc : stc2:domain.polarization.PolVector\l}" alt="" coords="8704,821,8907,883"/>
+<area shape="rect" id="node184" href="#domain.polarization.PolBasis" title="{domain/polarization/PolBasis}" alt="" coords="4453,827,4600,877"/>
+<area shape="rect" id="node185" href="#domain.polarization.StdPolBasis" title="{domain/polarization/StdPolBasis}" alt="" coords="4425,677,4585,726"/>
+<area shape="rect" id="node186" href="#domain.polarization.PolStokesBasis" title="{domain/polarization/PolStokesBasis}" alt="" coords="4116,273,4289,322"/>
+<area shape="rect" id="node187" href="#domain.polarization.PolCircularBasis" title="{domain/polarization/PolCircularBasis}" alt="" coords="4313,273,4495,322"/>
+<area shape="rect" id="node188" href="#domain.polarization.PolLinearBasis" title="{domain/polarization/PolLinearBasis}" alt="" coords="4519,273,4695,322"/>
+<area shape="rect" id="node189" href="#domain.polarization.PolVectorBasis" title="{domain/polarization/PolVectorBasis}" alt="" coords="4719,273,4895,322"/>
+<area shape="rect" id="node191" href="#domain.polarization.CoordSpace" title="{domain/polarization/CoordSpace}" alt="" coords="8011,827,8173,877"/>
+<area shape="rect" id="node192" href="#domain.polarization.PolSpace" title="{domain/polarization/PolSpace}" alt="" coords="8404,273,8553,322"/>
+<area shape="rect" id="node193" href="#domain.polarization.Cartesian" title="{domain/polarization/Cartesian}" alt="" coords="8480,677,8629,726"/>
+<area shape="rect" id="node195" href="#domain.polarization.DerivedPolarizationCoordinate" title="{domain/polarization/DerivedPolarizationCoordinate}" alt="" coords="23380,677,23623,726"/>
+<area shape="rect" id="node196" href="#domain.polarization.Stokes" title="{domain/polarization/Stokes|+coord : stc2:domain.polarization.PolStokesCoord\l}" alt="" coords="22984,273,23221,322"/>
+<area shape="rect" id="node197" href="#domain.polarization.Circular" title="{domain/polarization/Circular|+coord : stc2:domain.polarization.PolCircularCoord\l}" alt="" coords="23245,273,23491,322"/>
+<area shape="rect" id="node198" href="#domain.polarization.Linear" title="{domain/polarization/Linear|+coord : stc2:domain.polarization.PolLinearCoord\l}" alt="" coords="23515,273,23752,322"/>
+<area shape="rect" id="node199" href="#domain.polarization.Vector" title="{domain/polarization/Vector|+coord : stc2:domain.polarization.PolVectorCoord\l}" alt="" coords="23776,273,24013,322"/>
 </map>
 
     <hr>
@@ -1534,12 +1534,12 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.generic.AssociatedQuantity">AssociatedQuantity</a> <a href="#domain.generic.AssymetricInterval">AssymetricInterval</a> <a href="#domain.generic.Bounds">Bounds</a> <a href="#domain.generic.Cartesian">Cartesian</a> <a href="#domain.generic.CoordAxis">CoordAxis</a> <a href="#domain.generic.CoordSpace">CoordSpace</a> <a href="#domain.generic.GenericBasis">GenericBasis</a> <a href="#domain.generic.GenericFrame">GenericFrame</a> <a href="#domain.generic.Measurement">Measurement</a> <a href="#domain.generic.StdGenericBasis">StdGenericBasis</a> <a href="#domain.generic.SymmetricInterval">SymmetricInterval</a> <a href="#domain.generic.Uncertainty">Uncertainty</a> 
+        <td colspan="2" class="feature-detail"><a href="#domain.generic.AssymetricInterval">AssymetricInterval</a> <a href="#domain.generic.Bounds">Bounds</a> <a href="#domain.generic.Cartesian">Cartesian</a> <a href="#domain.generic.CoordAxis">CoordAxis</a> <a href="#domain.generic.CoordSpace">CoordSpace</a> <a href="#domain.generic.GenericBasis">GenericBasis</a> <a href="#domain.generic.GenericFrame">GenericFrame</a> <a href="#domain.generic.Measurement">Measurement</a> <a href="#domain.generic.StdGenericBasis">StdGenericBasis</a> <a href="#domain.generic.SymmetricInterval">SymmetricInterval</a> <a href="#domain.generic.Uncertainty">Uncertainty</a> 
         </td>
       </tr>
       <tr>
-        <td width="20%" class="info-title">Primitive types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.generic.GenericCoord">GenericCoord</a> 
+        <td width="20%" class="info-title">Data types</td>
+        <td colspan="2" class="feature-detail"><a href="#domain.generic.AssociatedValue">AssociatedValue</a> <a href="#domain.generic.GenericCoord">GenericCoord</a> 
         </td>
       </tr>
       <tr>
@@ -1548,13 +1548,13 @@
         </td>
       </tr>
     </table>
-    <h3><a name="domain.generic.AssociatedQuantity"></a>2.4.1 objectType: AssociatedQuantity
+    <h3><a name="domain.generic.AssociatedValue"></a>2.4.1 dataType: AssociatedValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.generic.AssociatedQuantity</td>
+          <td class="objecttype-name" colspan="1">domain.generic.AssociatedValue</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -1582,13 +1582,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.generic.AssociatedQuantity.loc"></a><b>loc</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.generic.AssociatedValue.loc"></a><b>loc</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.generic.AssociatedQuantity.loc</td>
+                      <td class="feature-detail">domain.generic.AssociatedValue.loc</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1610,13 +1610,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.generic.AssociatedQuantity.axis"></a><b>axis</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.generic.AssociatedValue.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"><a href="#domain.generic.CoordAxis">CoordAxis [stc2:domain.generic.CoordAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.generic.AssociatedQuantity.axis</td>
+                      <td class="feature-detail">domain.generic.AssociatedValue.axis</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -1915,7 +1915,7 @@
                     </tr>
                     <tr>
                       <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.generic.AssociatedQuantity">AssociatedQuantity</a> <a href="#domain.generic.Cartesian">Cartesian</a> 
+                      <td class="feature-detail" colspan="3"><a href="#domain.generic.AssociatedValue">AssociatedValue</a> <a href="#domain.generic.Cartesian">Cartesian</a> 
                       </td>
                     </tr>
                     <tr>
@@ -2084,25 +2084,67 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.generic.GenericCoord"></a>2.4.8 primitiveType: GenericCoord
+    </div><br><h3><a name="domain.generic.GenericCoord"></a>2.4.8 dataType: GenericCoord
     </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">domain.generic.GenericCoord</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#domain.generic">generic</a></td>
-      </tr>
-    </table><br><h3><a name="domain.generic.GenericFrame"></a>2.4.9 objectType: GenericFrame
+    <div align="center">
+      <table border="1" width="100%" cellspacing="2">
+        <tr>
+          <td class="objecttype-title" width="20%">vodml-id</td>
+          <td class="objecttype-name" colspan="1">domain.generic.GenericCoord</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">
+            <table width="100%" cellpadding="0" cellspacing="0" border="0">
+              <tr>
+                <td colspan="2" bgcolor="#cacaca">
+                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
+                    <tr>
+                      <td width="20%" class="info-title">package</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.generic">generic</a></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.generic.GenericCoord.elem"></a><b>elem</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.generic.AssociatedValue">AssociatedValue [stc2:domain.generic.AssociatedValue]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.generic.GenericCoord.elem</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="domain.generic.GenericFrame"></a>2.4.9 objectType: GenericFrame
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -2507,17 +2549,12 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.pixel.AssociatedQuantity">AssociatedQuantity</a> <a href="#domain.pixel.Pixel">Pixel</a> <a href="#domain.pixel.Pixel1D">Pixel1D</a> <a href="#domain.pixel.Pixel2D">Pixel2D</a> <a href="#domain.pixel.Pixel3D">Pixel3D</a> <a href="#domain.pixel.PixelAxis">PixelAxis</a> <a href="#domain.pixel.PixelBasis">PixelBasis</a> <a href="#domain.pixel.PixelFrame">PixelFrame</a> <a href="#domain.pixel.PixelSpace">PixelSpace</a> <a href="#domain.pixel.StdPixelBasis">StdPixelBasis</a> 
+        <td colspan="2" class="feature-detail"><a href="#domain.pixel.Pixel">Pixel</a> <a href="#domain.pixel.Pixel1D">Pixel1D</a> <a href="#domain.pixel.Pixel2D">Pixel2D</a> <a href="#domain.pixel.Pixel3D">Pixel3D</a> <a href="#domain.pixel.PixelAxis">PixelAxis</a> <a href="#domain.pixel.PixelBasis">PixelBasis</a> <a href="#domain.pixel.PixelFrame">PixelFrame</a> <a href="#domain.pixel.PixelSpace">PixelSpace</a> <a href="#domain.pixel.StdPixelBasis">StdPixelBasis</a> 
         </td>
       </tr>
       <tr>
         <td width="20%" class="info-title">Data types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.pixel.PixelCoord">PixelCoord</a> 
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">Primitive types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.pixel.PixelCoord1D">PixelCoord1D</a> <a href="#domain.pixel.PixelCoord2D">PixelCoord2D</a> <a href="#domain.pixel.PixellCoord3D">PixellCoord3D</a> 
+        <td colspan="2" class="feature-detail"><a href="#domain.pixel.AssociatedValue">AssociatedValue</a> <a href="#domain.pixel.PixelCoord">PixelCoord</a> <a href="#domain.pixel.PixelCoord1D">PixelCoord1D</a> <a href="#domain.pixel.PixelCoord2D">PixelCoord2D</a> <a href="#domain.pixel.PixellCoord3D">PixellCoord3D</a> 
         </td>
       </tr>
       <tr>
@@ -2526,13 +2563,13 @@
         </td>
       </tr>
     </table>
-    <h3><a name="domain.pixel.AssociatedQuantity"></a>2.5.1 objectType: AssociatedQuantity
+    <h3><a name="domain.pixel.AssociatedValue"></a>2.5.1 dataType: AssociatedValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.pixel.AssociatedQuantity</td>
+          <td class="objecttype-name" colspan="1">domain.pixel.AssociatedValue</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -2560,13 +2597,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.pixel.AssociatedQuantity.loc"></a><b>loc</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.pixel.AssociatedValue.loc"></a><b>loc</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.pixel.AssociatedQuantity.loc</td>
+                      <td class="feature-detail">domain.pixel.AssociatedValue.loc</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -2588,13 +2625,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.pixel.AssociatedQuantity.axis"></a><b>axis</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.pixel.AssociatedValue.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"><a href="#domain.pixel.PixelAxis">PixelAxis [stc2:domain.pixel.PixelAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.pixel.AssociatedQuantity.axis</td>
+                      <td class="feature-detail">domain.pixel.AssociatedValue.axis</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -2870,7 +2907,7 @@
                     </tr>
                     <tr>
                       <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.pixel.AssociatedQuantity">AssociatedQuantity</a> 
+                      <td class="feature-detail" colspan="3"><a href="#domain.pixel.AssociatedValue">AssociatedValue</a> 
                       </td>
                     </tr>
                     <tr>
@@ -2987,43 +3024,135 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.pixel.PixelCoord1D"></a>2.5.9 primitiveType: PixelCoord1D
+    </div><br><h3><a name="domain.pixel.PixelCoord1D"></a>2.5.9 dataType: PixelCoord1D
     </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">domain.pixel.PixelCoord1D</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#domain.pixel">pixel</a></td>
-      </tr>
-    </table><br><h3><a name="domain.pixel.PixelCoord2D"></a>2.5.10 primitiveType: PixelCoord2D
+    <div align="center">
+      <table border="1" width="100%" cellspacing="2">
+        <tr>
+          <td class="objecttype-title" width="20%">vodml-id</td>
+          <td class="objecttype-name" colspan="1">domain.pixel.PixelCoord1D</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">
+            <table width="100%" cellpadding="0" cellspacing="0" border="0">
+              <tr>
+                <td colspan="2" bgcolor="#cacaca">
+                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
+                    <tr>
+                      <td width="20%" class="info-title">package</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.pixel">pixel</a></td>
+                    </tr>
+                    <tr>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.pixel.PixelCoord">PixelCoord [stc2:domain.pixel.PixelCoord]</a></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.pixel.PixelCoord1D.elem"></a><b>elem</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.pixel.AssociatedValue">AssociatedValue [stc2:domain.pixel.AssociatedValue]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.pixel.PixelCoord1D.elem</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="domain.pixel.PixelCoord2D"></a>2.5.10 dataType: PixelCoord2D
     </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">domain.pixel.PixelCoord2D</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#domain.pixel">pixel</a></td>
-      </tr>
-    </table><br><h3><a name="domain.pixel.PixelFrame"></a>2.5.11 objectType: PixelFrame
+    <div align="center">
+      <table border="1" width="100%" cellspacing="2">
+        <tr>
+          <td class="objecttype-title" width="20%">vodml-id</td>
+          <td class="objecttype-name" colspan="1">domain.pixel.PixelCoord2D</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">
+            <table width="100%" cellpadding="0" cellspacing="0" border="0">
+              <tr>
+                <td colspan="2" bgcolor="#cacaca">
+                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
+                    <tr>
+                      <td width="20%" class="info-title">package</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.pixel">pixel</a></td>
+                    </tr>
+                    <tr>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.pixel.PixelCoord">PixelCoord [stc2:domain.pixel.PixelCoord]</a></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.pixel.PixelCoord2D.elem"></a><b>elem</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.pixel.AssociatedValue">AssociatedValue [stc2:domain.pixel.AssociatedValue]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.pixel.PixelCoord2D.elem</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">2</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="domain.pixel.PixelFrame"></a>2.5.11 objectType: PixelFrame
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -3183,25 +3312,71 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.pixel.PixellCoord3D"></a>2.5.13 primitiveType: PixellCoord3D
+    </div><br><h3><a name="domain.pixel.PixellCoord3D"></a>2.5.13 dataType: PixellCoord3D
     </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">domain.pixel.PixellCoord3D</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#domain.pixel">pixel</a></td>
-      </tr>
-    </table><br><h3><a name="domain.pixel.StdPixelBasis"></a>2.5.14 objectType: StdPixelBasis
+    <div align="center">
+      <table border="1" width="100%" cellspacing="2">
+        <tr>
+          <td class="objecttype-title" width="20%">vodml-id</td>
+          <td class="objecttype-name" colspan="1">domain.pixel.PixellCoord3D</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">
+            <table width="100%" cellpadding="0" cellspacing="0" border="0">
+              <tr>
+                <td colspan="2" bgcolor="#cacaca">
+                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
+                    <tr>
+                      <td width="20%" class="info-title">package</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.pixel">pixel</a></td>
+                    </tr>
+                    <tr>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.pixel.PixelCoord">PixelCoord [stc2:domain.pixel.PixelCoord]</a></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.pixel.PixellCoord3D.elem"></a><b>elem</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.pixel.AssociatedValue">AssociatedValue [stc2:domain.pixel.AssociatedValue]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.pixel.PixellCoord3D.elem</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">3</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="domain.pixel.StdPixelBasis"></a>2.5.14 objectType: StdPixelBasis
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -3259,12 +3434,12 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.polarization.AssociatedCircularPol">AssociatedCircularPol</a> <a href="#domain.polarization.AssociatedLinearPol">AssociatedLinearPol</a> <a href="#domain.polarization.AssociatedStokesPol">AssociatedStokesPol</a> <a href="#domain.polarization.AssociatedVectorPol">AssociatedVectorPol</a> <a href="#domain.polarization.Cartesian">Cartesian</a> <a href="#domain.polarization.Circular">Circular</a> <a href="#domain.polarization.CoordSpace">CoordSpace</a> <a href="#domain.polarization.DerivedPolarizationCoordinate">DerivedPolarizationCoordinate</a> <a href="#domain.polarization.DiscreteAxis">DiscreteAxis</a> <a href="#domain.polarization.Linear">Linear</a> <a href="#domain.polarization.PolBasis">PolBasis</a> <a href="#domain.polarization.PolCircularBasis">PolCircularBasis</a> <a href="#domain.polarization.PolLinearBasis">PolLinearBasis</a> <a href="#domain.polarization.PolSpace">PolSpace</a> <a href="#domain.polarizati!
 on.PolSto
 kesBasis">PolStokesBasis</a> <a href="#domain.polarization.PolVectorBasis">PolVectorBasis</a> <a href="#domain.polarization.PolarizationFrame">PolarizationFrame</a> <a href="#domain.polarization.StdPolBasis">StdPolBasis</a> <a href="#domain.polarization.Stokes">Stokes</a> <a href="#domain.polarization.Vector">Vector</a> 
+        <td colspan="2" class="feature-detail"><a href="#domain.polarization.Cartesian">Cartesian</a> <a href="#domain.polarization.Circular">Circular</a> <a href="#domain.polarization.CoordSpace">CoordSpace</a> <a href="#domain.polarization.DerivedPolarizationCoordinate">DerivedPolarizationCoordinate</a> <a href="#domain.polarization.DiscreteAxis">DiscreteAxis</a> <a href="#domain.polarization.Linear">Linear</a> <a href="#domain.polarization.PolBasis">PolBasis</a> <a href="#domain.polarization.PolCircularBasis">PolCircularBasis</a> <a href="#domain.polarization.PolLinearBasis">PolLinearBasis</a> <a href="#domain.polarization.PolSpace">PolSpace</a> <a href="#domain.polarization.PolStokesBasis">PolStokesBasis</a> <a href="#domain.polarization.PolVectorBasis">PolVectorBasis</a> <a href="#domain.polarization.PolarizationFrame">PolarizationFrame</a> <a href="#domain.polarization.StdPolBasis">StdPolBasis</a> <a href="#domain.polarization.Stokes">Stokes</a> <a href="#domain.polar!
 ization.V
 ector">Vector</a> 
         </td>
       </tr>
       <tr>
         <td width="20%" class="info-title">Data types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.polarization.PolCircularCoord">PolCircularCoord</a> <a href="#domain.polarization.PolCoord">PolCoord</a> <a href="#domain.polarization.PolLinearCoord">PolLinearCoord</a> <a href="#domain.polarization.PolStokesCoord">PolStokesCoord</a> <a href="#domain.polarization.PolVectorCoord">PolVectorCoord</a> 
+        <td colspan="2" class="feature-detail"><a href="#domain.polarization.AssociatedCircularPol">AssociatedCircularPol</a> <a href="#domain.polarization.AssociatedLinearPol">AssociatedLinearPol</a> <a href="#domain.polarization.AssociatedStokesPol">AssociatedStokesPol</a> <a href="#domain.polarization.AssociatedVectorPol">AssociatedVectorPol</a> <a href="#domain.polarization.PolCircularCoord">PolCircularCoord</a> <a href="#domain.polarization.PolCoord">PolCoord</a> <a href="#domain.polarization.PolLinearCoord">PolLinearCoord</a> <a href="#domain.polarization.PolStokesCoord">PolStokesCoord</a> <a href="#domain.polarization.PolVectorCoord">PolVectorCoord</a> 
         </td>
       </tr>
       <tr>
@@ -3278,7 +3453,7 @@
         </td>
       </tr>
     </table>
-    <h3><a name="domain.polarization.AssociatedCircularPol"></a>2.6.1 objectType: AssociatedCircularPol
+    <h3><a name="domain.polarization.AssociatedCircularPol"></a>2.6.1 dataType: AssociatedCircularPol
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -3366,7 +3541,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.polarization.AssociatedLinearPol"></a>2.6.2 objectType: AssociatedLinearPol
+    </div><br><h3><a name="domain.polarization.AssociatedLinearPol"></a>2.6.2 dataType: AssociatedLinearPol
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -3454,7 +3629,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.polarization.AssociatedStokesPol"></a>2.6.3 objectType: AssociatedStokesPol
+    </div><br><h3><a name="domain.polarization.AssociatedStokesPol"></a>2.6.3 dataType: AssociatedStokesPol
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -3542,7 +3717,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.polarization.AssociatedVectorPol"></a>2.6.4 objectType: AssociatedVectorPol
+    </div><br><h3><a name="domain.polarization.AssociatedVectorPol"></a>2.6.4 dataType: AssociatedVectorPol
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -4127,6 +4302,34 @@
                       <td width="20%" class="info-title">extends</td>
                       <td colspan="3" class="feature-detail"><a href="#domain.polarization.PolCoord">PolCoord [stc2:domain.polarization.PolCoord]</a></td>
                     </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.PolCircularCoord.elem"></a><b>elem</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.polarization.AssociatedCircularPol">AssociatedCircularPol [stc2:domain.polarization.AssociatedCircularPol]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.polarization.PolCircularCoord.elem</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
                   </table>
                 </td>
               </tr>
@@ -4314,6 +4517,34 @@
                       <td width="20%" class="info-title">extends</td>
                       <td colspan="3" class="feature-detail"><a href="#domain.polarization.PolCoord">PolCoord [stc2:domain.polarization.PolCoord]</a></td>
                     </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.PolLinearCoord.elem"></a><b>elem</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.polarization.AssociatedLinearPol">AssociatedLinearPol [stc2:domain.polarization.AssociatedLinearPol]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.polarization.PolLinearCoord.elem</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
                   </table>
                 </td>
               </tr>
@@ -4528,6 +4759,34 @@
                       <td width="20%" class="info-title">extends</td>
                       <td colspan="3" class="feature-detail"><a href="#domain.polarization.PolCoord">PolCoord [stc2:domain.polarization.PolCoord]</a></td>
                     </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.PolStokesCoord.elem"></a><b>elem</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.polarization.AssociatedStokesPol">AssociatedStokesPol [stc2:domain.polarization.AssociatedStokesPol]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.polarization.PolStokesCoord.elem</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
                   </table>
                 </td>
               </tr>
@@ -4678,6 +4937,34 @@
                       <td width="20%" class="info-title">extends</td>
                       <td colspan="3" class="feature-detail"><a href="#domain.polarization.PolCoord">PolCoord [stc2:domain.polarization.PolCoord]</a></td>
                     </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.polarization.PolVectorCoord.elem"></a><b>elem</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.polarization.AssociatedVectorPol">AssociatedVectorPol [stc2:domain.polarization.AssociatedVectorPol]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.polarization.PolVectorCoord.elem</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
                   </table>
                 </td>
               </tr>
@@ -4975,12 +5262,12 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.redshift.AssociatedQuantity">AssociatedQuantity</a> <a href="#domain.redshift.AssymetricInterval">AssymetricInterval</a> <a href="#domain.redshift.Bounds">Bounds</a> <a href="#domain.redshift.Cartesian">Cartesian</a> <a href="#domain.redshift.CoordAxis">CoordAxis</a> <a href="#domain.redshift.CoordSpace">CoordSpace</a> <a href="#domain.redshift.DerivedRedshiftCoordinate">DerivedRedshiftCoordinate</a> <a href="#domain.redshift.DopplerVelocity">DopplerVelocity</a> <a href="#domain.redshift.Redshift">Redshift</a> <a href="#domain.redshift.RedshiftBasis">RedshiftBasis</a> <a href="#domain.redshift.RedshiftFrame">RedshiftFrame</a> <a href="#domain.redshift.RedshiftSpace">RedshiftSpace</a> <a href="#domain.redshift.StdRedshiftBasis">StdRedshiftBasis</a> <a href="#domain.redshift.SymmetricInterval">SymmetricInterval</a> <a href="#domain.redshift.Uncertainty">Uncertainty</a> 
+        <td colspan="2" class="feature-detail"><a href="#domain.redshift.AssymetricInterval">AssymetricInterval</a> <a href="#domain.redshift.Bounds">Bounds</a> <a href="#domain.redshift.Cartesian">Cartesian</a> <a href="#domain.redshift.CoordAxis">CoordAxis</a> <a href="#domain.redshift.CoordSpace">CoordSpace</a> <a href="#domain.redshift.DerivedRedshiftCoordinate">DerivedRedshiftCoordinate</a> <a href="#domain.redshift.DopplerVelocity">DopplerVelocity</a> <a href="#domain.redshift.Redshift">Redshift</a> <a href="#domain.redshift.RedshiftBasis">RedshiftBasis</a> <a href="#domain.redshift.RedshiftFrame">RedshiftFrame</a> <a href="#domain.redshift.RedshiftSpace">RedshiftSpace</a> <a href="#domain.redshift.StdRedshiftBasis">StdRedshiftBasis</a> <a href="#domain.redshift.SymmetricInterval">SymmetricInterval</a> <a href="#domain.redshift.Uncertainty">Uncertainty</a> 
         </td>
       </tr>
       <tr>
         <td width="20%" class="info-title">Data types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.redshift.RedshiftCoord">RedshiftCoord</a> 
+        <td colspan="2" class="feature-detail"><a href="#domain.redshift.AssociatedValue">AssociatedValue</a> <a href="#domain.redshift.RedshiftCoord">RedshiftCoord</a> 
         </td>
       </tr>
       <tr>
@@ -4994,13 +5281,13 @@
         </td>
       </tr>
     </table>
-    <h3><a name="domain.redshift.AssociatedQuantity"></a>2.7.1 objectType: AssociatedQuantity
+    <h3><a name="domain.redshift.AssociatedValue"></a>2.7.1 dataType: AssociatedValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.redshift.AssociatedQuantity</td>
+          <td class="objecttype-name" colspan="1">domain.redshift.AssociatedValue</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -5028,13 +5315,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.redshift.AssociatedQuantity.loc"></a><b>loc</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.redshift.AssociatedValue.loc"></a><b>loc</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.redshift.AssociatedQuantity.loc</td>
+                      <td class="feature-detail">domain.redshift.AssociatedValue.loc</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -5056,13 +5343,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.redshift.AssociatedQuantity.axis"></a><b>axis</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.redshift.AssociatedValue.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"><a href="#domain.redshift.CoordAxis">CoordAxis [stc2:domain.redshift.CoordAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.redshift.AssociatedQuantity.axis</td>
+                      <td class="feature-detail">domain.redshift.AssociatedValue.axis</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -5338,7 +5625,7 @@
                     </tr>
                     <tr>
                       <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.redshift.AssociatedQuantity">AssociatedQuantity</a> <a href="#domain.redshift.RedshiftSpace">RedshiftSpace</a> 
+                      <td class="feature-detail" colspan="3"><a href="#domain.redshift.AssociatedValue">AssociatedValue</a> <a href="#domain.redshift.RedshiftSpace">RedshiftSpace</a> 
                       </td>
                     </tr>
                     <tr>
@@ -5779,6 +6066,34 @@
                       <td width="20%" class="info-title">package</td>
                       <td colspan="3" class="feature-detail"><a href="#domain.redshift">redshift</a></td>
                     </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.redshift.RedshiftCoord.elem"></a><b>elem</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.redshift.AssociatedValue">AssociatedValue [stc2:domain.redshift.AssociatedValue]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.redshift.RedshiftCoord.elem</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
                   </table>
                 </td>
               </tr>
@@ -6211,12 +6526,12 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">Object types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.spatial.AssociatedQuantity">AssociatedQuantity</a> <a href="#domain.spatial.AssymetricInterval">AssymetricInterval</a> <a href="#domain.spatial.Bounds1D">Bounds1D</a> <a href="#domain.spatial.Bounds2D">Bounds2D</a> <a href="#domain.spatial.Bounds3D">Bounds3D</a> <a href="#domain.spatial.Cartesian">Cartesian</a> <a href="#domain.spatial.Circle">Circle</a> <a href="#domain.spatial.CoordAxis">CoordAxis</a> <a href="#domain.spatial.CoordSpace">CoordSpace</a> <a href="#domain.spatial.Cube">Cube</a> <a href="#domain.spatial.CustomSpaceBasis">CustomSpaceBasis</a> <a href="#domain.spatial.Cylindrical">Cylindrical</a> <a href="#domain.spatial.Ellipse">Ellipse</a> <a href="#domain.spatial.Ellipsoid">Ellipsoid</a> <a href="#domain.spatial.ErrorMatrix2x2">ErrorMatrix2x2</a> <a href="#domain.spatial.ErrorMatrix3x3">ErrorMatrix3x3</a> <a href="#domain.spatial.HealPix">HealPix</a> <a href="#domain.spatial.Polar">Polar</a> <a !
 href="#do
 main.spatial.Position">Position</a> <a href="#domain.spatial.Position1D">Position1D</a> <a href="#domain.spatial.Position2D">Position2D</a> <a href="#domain.spatial.Position3D">Position3D</a> <a href="#domain.spatial.Rectangle">Rectangle</a> <a href="#domain.spatial.SpaceBasis">SpaceBasis</a> <a href="#domain.spatial.SpaceFrame">SpaceFrame</a> <a href="#domain.spatial.Sphere">Sphere</a> <a href="#domain.spatial.Spherical">Spherical</a> <a href="#domain.spatial.StdSpaceBasis">StdSpaceBasis</a> <a href="#domain.spatial.SymmetricInterval">SymmetricInterval</a> <a href="#domain.spatial.Uncertainty1D">Uncertainty1D</a> <a href="#domain.spatial.Uncertainty2D">Uncertainty2D</a> <a href="#domain.spatial.Uncertainty3D">Uncertainty3D</a> <a href="#domain.spatial.UnitSphere">UnitSphere</a> 
+        <td colspan="2" class="feature-detail"><a href="#domain.spatial.AssymetricInterval">AssymetricInterval</a> <a href="#domain.spatial.Bounds1D">Bounds1D</a> <a href="#domain.spatial.Bounds2D">Bounds2D</a> <a href="#domain.spatial.Bounds3D">Bounds3D</a> <a href="#domain.spatial.Cartesian">Cartesian</a> <a href="#domain.spatial.Circle">Circle</a> <a href="#domain.spatial.CoordAxis">CoordAxis</a> <a href="#domain.spatial.CoordSpace">CoordSpace</a> <a href="#domain.spatial.Cube">Cube</a> <a href="#domain.spatial.CustomSpaceBasis">CustomSpaceBasis</a> <a href="#domain.spatial.Cylindrical">Cylindrical</a> <a href="#domain.spatial.Ellipse">Ellipse</a> <a href="#domain.spatial.Ellipsoid">Ellipsoid</a> <a href="#domain.spatial.ErrorMatrix2x2">ErrorMatrix2x2</a> <a href="#domain.spatial.ErrorMatrix3x3">ErrorMatrix3x3</a> <a href="#domain.spatial.HealPix">HealPix</a> <a href="#domain.spatial.Polar">Polar</a> <a href="#domain.spatial.Position">Position</a> <a href="#domain.spatia!
 l.Positio
 n1D">Position1D</a> <a href="#domain.spatial.Position2D">Position2D</a> <a href="#domain.spatial.Position3D">Position3D</a> <a href="#domain.spatial.Rectangle">Rectangle</a> <a href="#domain.spatial.SpaceBasis">SpaceBasis</a> <a href="#domain.spatial.SpaceFrame">SpaceFrame</a> <a href="#domain.spatial.Sphere">Sphere</a> <a href="#domain.spatial.Spherical">Spherical</a> <a href="#domain.spatial.StdSpaceBasis">StdSpaceBasis</a> <a href="#domain.spatial.SymmetricInterval">SymmetricInterval</a> <a href="#domain.spatial.Uncertainty1D">Uncertainty1D</a> <a href="#domain.spatial.Uncertainty2D">Uncertainty2D</a> <a href="#domain.spatial.Uncertainty3D">Uncertainty3D</a> <a href="#domain.spatial.UnitSphere">UnitSphere</a> 
         </td>
       </tr>
       <tr>
         <td width="20%" class="info-title">Data types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.spatial.Epoch">Epoch</a> <a href="#domain.spatial.SpatialCoord">SpatialCoord</a> 
+        <td colspan="2" class="feature-detail"><a href="#domain.spatial.AssociatedValue">AssociatedValue</a> <a href="#domain.spatial.Epoch">Epoch</a> <a href="#domain.spatial.SpatialCoord">SpatialCoord</a> <a href="#domain.spatial.SpatialCoord1D">SpatialCoord1D</a> <a href="#domain.spatial.SpatialCoord2D">SpatialCoord2D</a> <a href="#domain.spatial.SpatialCoord3D">SpatialCoord3D</a> 
         </td>
       </tr>
       <tr>
@@ -6225,23 +6540,18 @@
         </td>
       </tr>
       <tr>
-        <td width="20%" class="info-title">Primitive types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.spatial.SpatialCoord1D">SpatialCoord1D</a> <a href="#domain.spatial.SpatialCoord2D">SpatialCoord2D</a> <a href="#domain.spatial.SpatialCoord3D">SpatialCoord3D</a> 
-        </td>
-      </tr>
-      <tr>
         <td width="20%" class="info-title">Parent package</td>
         <td colspan="2" class="feature-detail"><a href="#domain">domain</a> 
         </td>
       </tr>
     </table>
-    <h3><a name="domain.spatial.AssociatedQuantity"></a>2.8.1 objectType: AssociatedQuantity
+    <h3><a name="domain.spatial.AssociatedValue"></a>2.8.1 dataType: AssociatedValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.AssociatedQuantity</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.AssociatedValue</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -6269,13 +6579,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.AssociatedQuantity.loc"></a><b>loc</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.AssociatedValue.loc"></a><b>loc</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.AssociatedQuantity.loc</td>
+                      <td class="feature-detail">domain.spatial.AssociatedValue.loc</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -6297,13 +6607,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.AssociatedQuantity.axis"></a><b>axis</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.AssociatedValue.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"><a href="#domain.spatial.CoordAxis">CoordAxis [stc2:domain.spatial.CoordAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spatial.AssociatedQuantity.axis</td>
+                      <td class="feature-detail">domain.spatial.AssociatedValue.axis</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -6900,7 +7210,7 @@
                     </tr>
                     <tr>
                       <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.spatial.AssociatedQuantity">AssociatedQuantity</a> <a href="#domain.spatial.Cartesian">Cartesian</a> <a href="#domain.spatial.Cylindrical">Cylindrical</a> <a href="#domain.spatial.HealPix">HealPix</a> <a href="#domain.spatial.Polar">Polar</a> <a href="#domain.spatial.Spherical">Spherical</a> <a href="#domain.spatial.UnitSphere">UnitSphere</a> 
+                      <td class="feature-detail" colspan="3"><a href="#domain.spatial.AssociatedValue">AssociatedValue</a> <a href="#domain.spatial.Cartesian">Cartesian</a> <a href="#domain.spatial.Cylindrical">Cylindrical</a> <a href="#domain.spatial.HealPix">HealPix</a> <a href="#domain.spatial.Polar">Polar</a> <a href="#domain.spatial.Spherical">Spherical</a> <a href="#domain.spatial.UnitSphere">UnitSphere</a> 
                       </td>
                     </tr>
                     <tr>
@@ -8601,13 +8911,178 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.SpatialCoord"></a>2.8.28 dataType: SpatialCoord
+    </div><br><h3><a name="domain.spatial.SpatialCoord"></a>2.8.28 dataType: SpatialCoord
+    </h3>
+    <div align="center">
+      <table border="1" width="100%" cellspacing="2">
+        <tr>
+          <td class="objecttype-title" width="20%">vodml-id</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.SpatialCoord</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">
+            <table width="100%" cellpadding="0" cellspacing="0" border="0">
+              <tr>
+                <td colspan="2" bgcolor="#cacaca">
+                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
+                    <tr>
+                      <td width="20%" class="info-title">package</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                    </tr>
+                    <tr>
+                      <td class="info-title">Subclasses in this model</td>
+                      <td class="feature-detail" colspan="3"><a href="#domain.spatial.SpatialCoord1D">SpatialCoord1D</a> <a href="#domain.spatial.SpatialCoord2D">SpatialCoord2D</a> <a href="#domain.spatial.SpatialCoord3D">SpatialCoord3D</a> 
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="domain.spatial.SpatialCoord1D"></a>2.8.29 dataType: SpatialCoord1D
+    </h3>
+    <div align="center">
+      <table border="1" width="100%" cellspacing="2">
+        <tr>
+          <td class="objecttype-title" width="20%">vodml-id</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.SpatialCoord1D</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">
+            <table width="100%" cellpadding="0" cellspacing="0" border="0">
+              <tr>
+                <td colspan="2" bgcolor="#cacaca">
+                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
+                    <tr>
+                      <td width="20%" class="info-title">package</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                    </tr>
+                    <tr>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.SpatialCoord">SpatialCoord [stc2:domain.spatial.SpatialCoord]</a></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SpatialCoord1D.elem"></a><b>elem</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.spatial.AssociatedValue">AssociatedValue [stc2:domain.spatial.AssociatedValue]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.spatial.SpatialCoord1D.elem</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="domain.spatial.SpatialCoord2D"></a>2.8.30 dataType: SpatialCoord2D
+    </h3>
+    <div align="center">
+      <table border="1" width="100%" cellspacing="2">
+        <tr>
+          <td class="objecttype-title" width="20%">vodml-id</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.SpatialCoord2D</td>
+        </tr>
+        <tr>
+          <td class="info-title">description</td>
+          <td class="feature-detail" colspan="1">
+            TODO : Missing description : please, update your UML model asap.
+            
+          </td>
+        </tr>
+        <tr>
+          <td colspan="2">
+            <table width="100%" cellpadding="0" cellspacing="0" border="0">
+              <tr>
+                <td colspan="2" bgcolor="#cacaca">
+                  <table width="100%" border="0" cellpadding="3" cellspacing="1">
+                    <tr>
+                      <td width="20%" class="info-title">package</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
+                    </tr>
+                    <tr>
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.SpatialCoord">SpatialCoord [stc2:domain.spatial.SpatialCoord]</a></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SpatialCoord2D.elem"></a><b>elem</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.spatial.AssociatedValue">AssociatedValue [stc2:domain.spatial.AssociatedValue]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.spatial.SpatialCoord2D.elem</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">2</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </div><br><h3><a name="domain.spatial.SpatialCoord3D"></a>2.8.31 dataType: SpatialCoord3D
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spatial.SpatialCoord</td>
+          <td class="objecttype-name" colspan="1">domain.spatial.SpatialCoord3D</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -8627,8 +9102,35 @@
                       <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
                     </tr>
                     <tr>
-                      <td class="info-title">Subclasses in this model</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.spatial.SpatialCoord1D">SpatialCoord1D</a> <a href="#domain.spatial.SpatialCoord2D">SpatialCoord2D</a> <a href="#domain.spatial.SpatialCoord3D">SpatialCoord3D</a> 
+                      <td width="20%" class="info-title">extends</td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.spatial.SpatialCoord">SpatialCoord [stc2:domain.spatial.SpatialCoord]</a></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spatial.SpatialCoord3D.elem"></a><b>elem</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.spatial.AssociatedValue">AssociatedValue [stc2:domain.spatial.AssociatedValue]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.spatial.SpatialCoord3D.elem</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">3</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
                       </td>
                     </tr>
                   </table>
@@ -8638,61 +9140,7 @@
           </td>
         </tr>
       </table>
-    </div><br><h3><a name="domain.spatial.SpatialCoord1D"></a>2.8.29 primitiveType: SpatialCoord1D
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">domain.spatial.SpatialCoord1D</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
-      </tr>
-    </table><br><h3><a name="domain.spatial.SpatialCoord2D"></a>2.8.30 primitiveType: SpatialCoord2D
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">domain.spatial.SpatialCoord2D</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
-      </tr>
-    </table><br><h3><a name="domain.spatial.SpatialCoord3D"></a>2.8.31 primitiveType: SpatialCoord3D
-    </h3>
-    <table border="1" width="100%" cellspacing="2">
-      <tr>
-        <td class="objecttype-title" width="20%">vodml-id</td>
-        <td class="objecttype-name" colspan="1">domain.spatial.SpatialCoord3D</td>
-      </tr>
-      <tr>
-        <td class="info-title">description</td>
-        <td class="feature-detail" colspan="1">
-          TODO : Missing description : please, update your UML model asap.
-          
-        </td>
-      </tr>
-      <tr>
-        <td width="20%" class="info-title">package</td>
-        <td colspan="3" class="feature-detail"><a href="#domain.spatial">spatial</a></td>
-      </tr>
-    </table><br><h3><a name="domain.spatial.Sphere"></a>2.8.32 objectType: Sphere
+    </div><br><h3><a name="domain.spatial.Sphere"></a>2.8.32 objectType: Sphere
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
@@ -10260,7 +10708,7 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">Data types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.spectral.AssociatedQuantity">AssociatedQuantity</a> <a href="#domain.spectral.SpectralCoord">SpectralCoord</a> 
+        <td colspan="2" class="feature-detail"><a href="#domain.spectral.AssociatedValue">AssociatedValue</a> <a href="#domain.spectral.SpectralCoord">SpectralCoord</a> 
         </td>
       </tr>
       <tr>
@@ -10269,13 +10717,13 @@
         </td>
       </tr>
     </table>
-    <h3><a name="domain.spectral.AssociatedQuantity"></a>2.9.1 dataType: AssociatedQuantity
+    <h3><a name="domain.spectral.AssociatedValue"></a>2.9.1 dataType: AssociatedValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.spectral.AssociatedQuantity</td>
+          <td class="objecttype-name" colspan="1">domain.spectral.AssociatedValue</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -10303,13 +10751,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spectral.AssociatedQuantity.loc"></a><b>loc</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spectral.AssociatedValue.loc"></a><b>loc</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"><a href="#ivoa">ivoa</a>:<a href="http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.html#RealQuantity">RealQuantity</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spectral.AssociatedQuantity.loc</td>
+                      <td class="feature-detail">domain.spectral.AssociatedValue.loc</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -10331,13 +10779,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spectral.AssociatedQuantity.axis"></a><b>axis</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spectral.AssociatedValue.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"><a href="#domain.spectral.CoordAxis">CoordAxis [stc2:domain.spectral.CoordAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.spectral.AssociatedQuantity.axis</td>
+                      <td class="feature-detail">domain.spectral.AssociatedValue.axis</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -10613,7 +11061,7 @@
                     </tr>
                     <tr>
                       <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.spectral.AssociatedQuantity">AssociatedQuantity</a> <a href="#domain.spectral.EnergySpace">EnergySpace</a> <a href="#domain.spectral.FrequencySpace">FrequencySpace</a> <a href="#domain.spectral.WavelengthSpace">WavelengthSpace</a> 
+                      <td class="feature-detail" colspan="3"><a href="#domain.spectral.AssociatedValue">AssociatedValue</a> <a href="#domain.spectral.EnergySpace">EnergySpace</a> <a href="#domain.spectral.FrequencySpace">FrequencySpace</a> <a href="#domain.spectral.WavelengthSpace">WavelengthSpace</a> 
                       </td>
                     </tr>
                     <tr>
@@ -11104,6 +11552,34 @@
                       <td width="20%" class="info-title">package</td>
                       <td colspan="3" class="feature-detail"><a href="#domain.spectral">spectral</a></td>
                     </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.spectral.SpectralCoord.elem"></a><b>elem</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.spectral.AssociatedValue">AssociatedValue [stc2:domain.spectral.AssociatedValue]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.spectral.SpectralCoord.elem</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
                   </table>
                 </td>
               </tr>
@@ -11557,7 +12033,7 @@
       </tr>
       <tr>
         <td width="20%" class="info-title">Data types</td>
-        <td colspan="2" class="feature-detail"><a href="#domain.temporal.AssociatedQuantity">AssociatedQuantity</a> <a href="#domain.temporal.TimeCoord">TimeCoord</a> <a href="#domain.temporal.TimeInstant">TimeInstant</a> <a href="#domain.temporal.TimeOffset">TimeOffset</a> 
+        <td colspan="2" class="feature-detail"><a href="#domain.temporal.AssociatedValue">AssociatedValue</a> <a href="#domain.temporal.TimeCoord">TimeCoord</a> <a href="#domain.temporal.TimeInstant">TimeInstant</a> <a href="#domain.temporal.TimeOffset">TimeOffset</a> 
         </td>
       </tr>
       <tr>
@@ -11571,13 +12047,13 @@
         </td>
       </tr>
     </table>
-    <h3><a name="domain.temporal.AssociatedQuantity"></a>2.10.1 dataType: AssociatedQuantity
+    <h3><a name="domain.temporal.AssociatedValue"></a>2.10.1 dataType: AssociatedValue
     </h3>
     <div align="center">
       <table border="1" width="100%" cellspacing="2">
         <tr>
           <td class="objecttype-title" width="20%">vodml-id</td>
-          <td class="objecttype-name" colspan="1">domain.temporal.AssociatedQuantity</td>
+          <td class="objecttype-name" colspan="1">domain.temporal.AssociatedValue</td>
         </tr>
         <tr>
           <td class="info-title">description</td>
@@ -11610,13 +12086,13 @@
                       <td class="feature-heading" width="70%">value</td>
                     </tr>
                     <tr>
-                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.AssociatedQuantity.axis"></a><b>axis</b></td>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.AssociatedValue.axis"></a><b>axis</b></td>
                       <td class="feature-heading">type</td>
                       <td class="feature-detail"><a href="#domain.temporal.CoordAxis">CoordAxis [stc2:domain.temporal.CoordAxis]</a></td>
                     </tr>
                     <tr>
                       <td class="feature-heading">vodml-id</td>
-                      <td class="feature-detail">domain.temporal.AssociatedQuantity.axis</td>
+                      <td class="feature-detail">domain.temporal.AssociatedValue.axis</td>
                     </tr>
                     <tr>
                       <td class="feature-heading">multiplicity</td>
@@ -11957,7 +12433,7 @@
                     </tr>
                     <tr>
                       <td class="info-title">referrers</td>
-                      <td class="feature-detail" colspan="3"><a href="#domain.temporal.AssociatedQuantity">AssociatedQuantity</a> <a href="#domain.temporal.TimeSpace">TimeSpace</a> 
+                      <td class="feature-detail" colspan="3"><a href="#domain.temporal.AssociatedValue">AssociatedValue</a> <a href="#domain.temporal.TimeSpace">TimeSpace</a> 
                       </td>
                     </tr>
                     <tr>
@@ -12563,6 +13039,34 @@
                       <td width="20%" class="info-title">package</td>
                       <td colspan="3" class="feature-detail"><a href="#domain.temporal">temporal</a></td>
                     </tr>
+                    <tr>
+                      <td colspan="3" class="info-title">attributes</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading" width="20%">name</td>
+                      <td class="feature-heading" width="10%">feature</td>
+                      <td class="feature-heading" width="70%">value</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-detail" valign="top" rowspan="4"><a name="domain.temporal.TimeCoord.elem"></a><b>elem</b></td>
+                      <td class="feature-heading">type</td>
+                      <td class="feature-detail"><a href="#domain.temporal.AssociatedValue">AssociatedValue [stc2:domain.temporal.AssociatedValue]</a></td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">vodml-id</td>
+                      <td class="feature-detail">domain.temporal.TimeCoord.elem</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">multiplicity</td>
+                      <td class="feature-detail">1</td>
+                    </tr>
+                    <tr>
+                      <td class="feature-heading">description</td>
+                      <td class="feature-detail">
+                        TODO : Missing description : please, update your UML model asap.
+                        
+                      </td>
+                    </tr>
                   </table>
                 </td>
               </tr>
@@ -12698,7 +13202,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.AssociatedQuantity">AssociatedQuantity [stc2:domain.temporal.AssociatedQuantity]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.AssociatedValue">AssociatedValue [stc2:domain.temporal.AssociatedValue]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -12762,7 +13266,7 @@
                     </tr>
                     <tr>
                       <td width="20%" class="info-title">extends</td>
-                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.AssociatedQuantity">AssociatedQuantity [stc2:domain.temporal.AssociatedQuantity]</a></td>
+                      <td colspan="3" class="feature-detail"><a href="#domain.temporal.AssociatedValue">AssociatedValue [stc2:domain.temporal.AssociatedValue]</a></td>
                     </tr>
                     <tr>
                       <td colspan="3" class="info-title">attributes</td>
@@ -12999,12 +13503,6 @@
                         
                       </td>
                     </tr>
-                    <tr>
-                      <td colspan="3" class="info-title">constraints</td>
-                    </tr>
-                    <tr>
-                      <td class="feature-detail" valign="top" colspan="3">axis:CoordAxis[1]</td>
-                    </tr>
                   </table>
                 </td>
               </tr>
@@ -15490,15 +15988,15 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.generic.AssociatedQuantity">domain.generic.AssociatedQuantity</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.generic.AssociatedValue">domain.generic.AssociatedValue</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.generic.AssociatedQuantity.axis">domain.generic.AssociatedQuantity.axis</a></td>
+        <td class="feature-detail"><a href="#domain.generic.AssociatedValue.axis">domain.generic.AssociatedValue.axis</a></td>
         <td class="feature-detail">reference</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -15506,7 +16004,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.generic.AssociatedQuantity.loc">domain.generic.AssociatedQuantity.loc</a></td>
+        <td class="feature-detail"><a href="#domain.generic.AssociatedValue.loc">domain.generic.AssociatedValue.loc</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -15635,7 +16133,15 @@
       </tr>
       <tr>
         <td class="feature-detail"><a href="#domain.generic.GenericCoord">domain.generic.GenericCoord</a></td>
-        <td class="feature-detail">primitiveType</td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.generic.GenericCoord.elem">domain.generic.GenericCoord.elem</a></td>
+        <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
@@ -15747,15 +16253,15 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.pixel.AssociatedQuantity">domain.pixel.AssociatedQuantity</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.pixel.AssociatedValue">domain.pixel.AssociatedValue</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.pixel.AssociatedQuantity.axis">domain.pixel.AssociatedQuantity.axis</a></td>
+        <td class="feature-detail"><a href="#domain.pixel.AssociatedValue.axis">domain.pixel.AssociatedValue.axis</a></td>
         <td class="feature-detail">reference</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -15763,7 +16269,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.pixel.AssociatedQuantity.loc">domain.pixel.AssociatedQuantity.loc</a></td>
+        <td class="feature-detail"><a href="#domain.pixel.AssociatedValue.loc">domain.pixel.AssociatedValue.loc</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -15860,7 +16366,15 @@
       </tr>
       <tr>
         <td class="feature-detail"><a href="#domain.pixel.PixelCoord1D">domain.pixel.PixelCoord1D</a></td>
-        <td class="feature-detail">primitiveType</td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.pixel.PixelCoord1D.elem">domain.pixel.PixelCoord1D.elem</a></td>
+        <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
@@ -15868,7 +16382,15 @@
       </tr>
       <tr>
         <td class="feature-detail"><a href="#domain.pixel.PixelCoord2D">domain.pixel.PixelCoord2D</a></td>
-        <td class="feature-detail">primitiveType</td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.pixel.PixelCoord2D.elem">domain.pixel.PixelCoord2D.elem</a></td>
+        <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
@@ -15916,7 +16438,15 @@
       </tr>
       <tr>
         <td class="feature-detail"><a href="#domain.pixel.PixellCoord3D">domain.pixel.PixellCoord3D</a></td>
-        <td class="feature-detail">primitiveType</td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.pixel.PixellCoord3D.elem">domain.pixel.PixellCoord3D.elem</a></td>
+        <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
@@ -15942,7 +16472,7 @@
       </tr>
       <tr>
         <td class="feature-detail"><a href="#domain.polarization.AssociatedCircularPol">domain.polarization.AssociatedCircularPol</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
@@ -15966,7 +16496,7 @@
       </tr>
       <tr>
         <td class="feature-detail"><a href="#domain.polarization.AssociatedLinearPol">domain.polarization.AssociatedLinearPol</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
@@ -15990,7 +16520,7 @@
       </tr>
       <tr>
         <td class="feature-detail"><a href="#domain.polarization.AssociatedStokesPol">domain.polarization.AssociatedStokesPol</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
@@ -16014,7 +16544,7 @@
       </tr>
       <tr>
         <td class="feature-detail"><a href="#domain.polarization.AssociatedVectorPol">domain.polarization.AssociatedVectorPol</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
@@ -16173,6 +16703,14 @@
         </td>
       </tr>
       <tr>
+        <td class="feature-detail"><a href="#domain.polarization.PolCircularCoord.elem">domain.polarization.PolCircularCoord.elem</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
         <td class="feature-detail"><a href="#domain.polarization.PolCoord">domain.polarization.PolCoord</a></td>
         <td class="feature-detail">dataType</td>
         <td class="feature-detail">
@@ -16237,6 +16775,14 @@
         </td>
       </tr>
       <tr>
+        <td class="feature-detail"><a href="#domain.polarization.PolLinearCoord.elem">domain.polarization.PolLinearCoord.elem</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
         <td class="feature-detail"><a href="#domain.polarization.PolSpace">domain.polarization.PolSpace</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
@@ -16309,6 +16855,14 @@
         </td>
       </tr>
       <tr>
+        <td class="feature-detail"><a href="#domain.polarization.PolStokesCoord.elem">domain.polarization.PolStokesCoord.elem</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
         <td class="feature-detail"><a href="#domain.polarization.PolVector">domain.polarization.PolVector</a></td>
         <td class="feature-detail">enumeration</td>
         <td class="feature-detail">
@@ -16365,6 +16919,14 @@
         </td>
       </tr>
       <tr>
+        <td class="feature-detail"><a href="#domain.polarization.PolVectorCoord.elem">domain.polarization.PolVectorCoord.elem</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
         <td class="feature-detail"><a href="#domain.polarization.PolarizationFrame">domain.polarization.PolarizationFrame</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
@@ -16437,15 +16999,15 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.redshift.AssociatedQuantity">domain.redshift.AssociatedQuantity</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.redshift.AssociatedValue">domain.redshift.AssociatedValue</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.redshift.AssociatedQuantity.axis">domain.redshift.AssociatedQuantity.axis</a></td>
+        <td class="feature-detail"><a href="#domain.redshift.AssociatedValue.axis">domain.redshift.AssociatedValue.axis</a></td>
         <td class="feature-detail">reference</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -16453,7 +17015,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.redshift.AssociatedQuantity.loc">domain.redshift.AssociatedQuantity.loc</a></td>
+        <td class="feature-detail"><a href="#domain.redshift.AssociatedValue.loc">domain.redshift.AssociatedValue.loc</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -16661,6 +17223,14 @@
         </td>
       </tr>
       <tr>
+        <td class="feature-detail"><a href="#domain.redshift.RedshiftCoord.elem">domain.redshift.RedshiftCoord.elem</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
         <td class="feature-detail"><a href="#domain.redshift.RedshiftFrame">domain.redshift.RedshiftFrame</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
@@ -16774,15 +17344,15 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.AssociatedQuantity">domain.spatial.AssociatedQuantity</a></td>
-        <td class="feature-detail">objectType</td>
+        <td class="feature-detail"><a href="#domain.spatial.AssociatedValue">domain.spatial.AssociatedValue</a></td>
+        <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.AssociatedQuantity.axis">domain.spatial.AssociatedQuantity.axis</a></td>
+        <td class="feature-detail"><a href="#domain.spatial.AssociatedValue.axis">domain.spatial.AssociatedValue.axis</a></td>
         <td class="feature-detail">reference</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -16790,7 +17360,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spatial.AssociatedQuantity.loc">domain.spatial.AssociatedQuantity.loc</a></td>
+        <td class="feature-detail"><a href="#domain.spatial.AssociatedValue.loc">domain.spatial.AssociatedValue.loc</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -17447,7 +18017,15 @@
       </tr>
       <tr>
         <td class="feature-detail"><a href="#domain.spatial.SpatialCoord1D">domain.spatial.SpatialCoord1D</a></td>
-        <td class="feature-detail">primitiveType</td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.spatial.SpatialCoord1D.elem">domain.spatial.SpatialCoord1D.elem</a></td>
+        <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
@@ -17455,7 +18033,15 @@
       </tr>
       <tr>
         <td class="feature-detail"><a href="#domain.spatial.SpatialCoord2D">domain.spatial.SpatialCoord2D</a></td>
-        <td class="feature-detail">primitiveType</td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.spatial.SpatialCoord2D.elem">domain.spatial.SpatialCoord2D.elem</a></td>
+        <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
@@ -17463,7 +18049,15 @@
       </tr>
       <tr>
         <td class="feature-detail"><a href="#domain.spatial.SpatialCoord3D">domain.spatial.SpatialCoord3D</a></td>
-        <td class="feature-detail">primitiveType</td>
+        <td class="feature-detail">dataType</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.spatial.SpatialCoord3D.elem">domain.spatial.SpatialCoord3D.elem</a></td>
+        <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
@@ -18174,7 +18768,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.AssociatedQuantity">domain.spectral.AssociatedQuantity</a></td>
+        <td class="feature-detail"><a href="#domain.spectral.AssociatedValue">domain.spectral.AssociatedValue</a></td>
         <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -18182,7 +18776,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.AssociatedQuantity.axis">domain.spectral.AssociatedQuantity.axis</a></td>
+        <td class="feature-detail"><a href="#domain.spectral.AssociatedValue.axis">domain.spectral.AssociatedValue.axis</a></td>
         <td class="feature-detail">reference</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -18190,7 +18784,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.spectral.AssociatedQuantity.loc">domain.spectral.AssociatedQuantity.loc</a></td>
+        <td class="feature-detail"><a href="#domain.spectral.AssociatedValue.loc">domain.spectral.AssociatedValue.loc</a></td>
         <td class="feature-detail">attribute</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -18390,6 +18984,14 @@
         </td>
       </tr>
       <tr>
+        <td class="feature-detail"><a href="#domain.spectral.SpectralCoord.elem">domain.spectral.SpectralCoord.elem</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
+        </td>
+      </tr>
+      <tr>
         <td class="feature-detail"><a href="#domain.spectral.SpectralFrame">domain.spectral.SpectralFrame</a></td>
         <td class="feature-detail">objectType</td>
         <td class="feature-detail">
@@ -18503,7 +19105,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.temporal.AssociatedQuantity">domain.temporal.AssociatedQuantity</a></td>
+        <td class="feature-detail"><a href="#domain.temporal.AssociatedValue">domain.temporal.AssociatedValue</a></td>
         <td class="feature-detail">dataType</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -18511,7 +19113,7 @@
         </td>
       </tr>
       <tr>
-        <td class="feature-detail"><a href="#domain.temporal.AssociatedQuantity.axis">domain.temporal.AssociatedQuantity.axis</a></td>
+        <td class="feature-detail"><a href="#domain.temporal.AssociatedValue.axis">domain.temporal.AssociatedValue.axis</a></td>
         <td class="feature-detail">reference</td>
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
@@ -18788,6 +19390,14 @@
         <td class="feature-detail">
           TODO : Missing description : please, update your UML model asap.
           
+        </td>
+      </tr>
+      <tr>
+        <td class="feature-detail"><a href="#domain.temporal.TimeCoord.elem">domain.temporal.TimeCoord.elem</a></td>
+        <td class="feature-detail">attribute</td>
+        <td class="feature-detail">
+          TODO : Missing description : please, update your UML model asap.
+          
         </td>
       </tr>
       <tr>

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

Modified: trunk/projects/dm/vo-dml/models/STC2/prototype/STCPattern-2.0.vo-dml.xml
==============================================================================
--- trunk/projects/dm/vo-dml/models/STC2/prototype/STCPattern-2.0.vo-dml.xml	Thu Sep 29 09:16:08 2016	(r3586)
+++ trunk/projects/dm/vo-dml/models/STC2/prototype/STCPattern-2.0.vo-dml.xml	Thu Sep 29 22:25:49 2016	(r3587)
@@ -10,7 +10,7 @@
   <author>Mark Cresitello-Dittmar, Arnold Rots</author>
   <version>2.0</version>
   <previousVersion>0.x</previousVersion>
-  <lastModified>2016-09-28T15:43:14</lastModified>
+  <lastModified>2016-09-29T16:17:54</lastModified>
   <import>
     <name>ivoa</name>
     <url>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</url>
@@ -1169,7 +1169,15 @@
       <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <primitiveType>
+      <dataType abstract="true">
+        <vodml-id>domain.pixel.PixelCoord</vodml-id>
+        <name>PixelCoord</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      </dataType>
+
+      <dataType>
         <vodml-id>domain.pixel.PixelCoord1D</vodml-id>
         <name>PixelCoord1D</name>
         <description>
@@ -1178,46 +1186,80 @@
         <extends>
           <vodml-ref>stc2:domain.pixel.PixelCoord</vodml-ref>
         </extends>
-      </primitiveType>
+        <attribute>
+          <vodml-id>domain.pixel.PixelCoord1D.elem</vodml-id>
+          <name>elem</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.pixel.AssociatedValue</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+      </dataType>
 
-      <primitiveType>
-        <vodml-id>domain.pixel.PixellCoord3D</vodml-id>
-        <name>PixellCoord3D</name>
+      <dataType>
+        <vodml-id>domain.pixel.PixelCoord2D</vodml-id>
+        <name>PixelCoord2D</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
           <vodml-ref>stc2:domain.pixel.PixelCoord</vodml-ref>
         </extends>
-      </primitiveType>
+        <attribute>
+          <vodml-id>domain.pixel.PixelCoord2D.elem</vodml-id>
+          <name>elem</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.pixel.AssociatedValue</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>2</minOccurs>
+            <maxOccurs>2</maxOccurs>
+          </multiplicity>
+        </attribute>
+      </dataType>
 
-      <primitiveType>
-        <vodml-id>domain.pixel.PixelCoord2D</vodml-id>
-        <name>PixelCoord2D</name>
+      <dataType>
+        <vodml-id>domain.pixel.PixellCoord3D</vodml-id>
+        <name>PixellCoord3D</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
           <vodml-ref>stc2:domain.pixel.PixelCoord</vodml-ref>
         </extends>
-      </primitiveType>
-
-      <dataType abstract="true">
-        <vodml-id>domain.pixel.PixelCoord</vodml-id>
-        <name>PixelCoord</name>
-        <description>
+        <attribute>
+          <vodml-id>domain.pixel.PixellCoord3D.elem</vodml-id>
+          <name>elem</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
+          <datatype>
+            <vodml-ref>stc2:domain.pixel.AssociatedValue</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>3</minOccurs>
+            <maxOccurs>3</maxOccurs>
+          </multiplicity>
+        </attribute>
       </dataType>
 
-      <objectType>
-        <vodml-id>domain.pixel.AssociatedQuantity</vodml-id>
-        <name>AssociatedQuantity</name>
+      <dataType>
+        <vodml-id>domain.pixel.AssociatedValue</vodml-id>
+        <name>AssociatedValue</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <attribute>
-          <vodml-id>domain.pixel.AssociatedQuantity.loc</vodml-id>
+          <vodml-id>domain.pixel.AssociatedValue.loc</vodml-id>
           <name>loc</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
@@ -1231,7 +1273,7 @@
           </multiplicity>
         </attribute>
         <reference>
-          <vodml-id>domain.pixel.AssociatedQuantity.axis</vodml-id>
+          <vodml-id>domain.pixel.AssociatedValue.axis</vodml-id>
           <name>axis</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
@@ -1244,6 +1286,27 @@
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </reference>
+      </dataType>
+
+      <objectType abstract="true">
+        <vodml-id>domain.pixel.PixelBasis</vodml-id>
+        <name>PixelBasis</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      </objectType>
+
+      <objectType>
+        <vodml-id>domain.pixel.StdPixelBasis</vodml-id>
+        <name>StdPixelBasis</name>
+        <description>origin: 0.0
+dimensionality: nD
+orientation: n/a
+
+</description>
+        <extends>
+          <vodml-ref>stc2:domain.pixel.PixelBasis</vodml-ref>
+        </extends>
       </objectType>
 
       <objectType>
@@ -1286,6 +1349,28 @@
       </objectType>
 
       <objectType>
+        <vodml-id>domain.pixel.PixelSpace</vodml-id>
+        <name>PixelSpace</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <collection>
+          <vodml-id>domain.pixel.PixelSpace.axis</vodml-id>
+          <name>axis</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.pixel.PixelAxis</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>-1</maxOccurs>
+          </multiplicity>
+        </collection>
+      </objectType>
+
+      <objectType>
         <vodml-id>domain.pixel.PixelAxis</vodml-id>
         <name>PixelAxis</name>
         <description>
@@ -1390,66 +1475,73 @@
         </attribute>
       </objectType>
 
-      <objectType abstract="true">
-        <vodml-id>domain.pixel.PixelBasis</vodml-id>
-        <name>PixelBasis</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-      </objectType>
+    </package>
 
-      <objectType>
-        <vodml-id>domain.pixel.StdPixelBasis</vodml-id>
-        <name>StdPixelBasis</name>
-        <description>origin: 0.0
-dimensionality: nD
-orientation: n/a
 
-</description>
-        <extends>
-          <vodml-ref>stc2:domain.pixel.PixelBasis</vodml-ref>
-        </extends>
-      </objectType>
 
-      <objectType>
-        <vodml-id>domain.pixel.PixelSpace</vodml-id>
-        <name>PixelSpace</name>
+    <package>
+      <vodml-id>domain.generic</vodml-id>
+      <name>generic</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <dataType>
+        <vodml-id>domain.generic.GenericCoord</vodml-id>
+        <name>GenericCoord</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <collection>
-          <vodml-id>domain.pixel.PixelSpace.axis</vodml-id>
-          <name>axis</name>
+        <attribute>
+          <vodml-id>domain.generic.GenericCoord.elem</vodml-id>
+          <name>elem</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.pixel.PixelAxis</vodml-ref>
+            <vodml-ref>stc2:domain.generic.AssociatedValue</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
-            <maxOccurs>-1</maxOccurs>
+            <maxOccurs>1</maxOccurs>
           </multiplicity>
-        </collection>
-      </objectType>
-
-    </package>
-
-
+        </attribute>
+      </dataType>
 
-    <package>
-      <vodml-id>domain.generic</vodml-id>
-      <name>generic</name>
-      <description>
+      <dataType>
+        <vodml-id>domain.generic.AssociatedValue</vodml-id>
+        <name>AssociatedValue</name>
+        <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <primitiveType>
-        <vodml-id>domain.generic.GenericCoord</vodml-id>
-        <name>GenericCoord</name>
-        <description>
+        <attribute>
+          <vodml-id>domain.generic.AssociatedValue.loc</vodml-id>
+          <name>loc</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      </primitiveType>
+          <datatype>
+            <vodml-ref>ivoa:RealQuantity</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+        <reference>
+          <vodml-id>domain.generic.AssociatedValue.axis</vodml-id>
+          <name>axis</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.generic.CoordAxis</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>0</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </reference>
+      </dataType>
 
       <objectType abstract="true">
         <vodml-id>domain.generic.GenericBasis</vodml-id>
@@ -1785,42 +1877,6 @@
         </attribute>
       </objectType>
 
-      <objectType>
-        <vodml-id>domain.generic.AssociatedQuantity</vodml-id>
-        <name>AssociatedQuantity</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <attribute>
-          <vodml-id>domain.generic.AssociatedQuantity.loc</vodml-id>
-          <name>loc</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>ivoa:RealQuantity</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-        <reference>
-          <vodml-id>domain.generic.AssociatedQuantity.axis</vodml-id>
-          <name>axis</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>stc2:domain.generic.CoordAxis</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>0</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </reference>
-      </objectType>
-
     </package>
 
 
@@ -1831,38 +1887,27 @@
       <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-      <primitiveType>
-        <vodml-id>domain.spatial.SpatialCoord1D</vodml-id>
-        <name>SpatialCoord1D</name>
+      <enumeration>
+        <vodml-id>domain.spatial.EpochType</vodml-id>
+        <name>EpochType</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>stc2:domain.spatial.SpatialCoord</vodml-ref>
-        </extends>
-      </primitiveType>
-
-      <primitiveType>
-        <vodml-id>domain.spatial.SpatialCoord2D</vodml-id>
-        <name>SpatialCoord2D</name>
-        <description>
+        <literal>
+          <vodml-id>domain.spatial.EpochType.J</vodml-id>
+          <name>J</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>stc2:domain.spatial.SpatialCoord</vodml-ref>
-        </extends>
-      </primitiveType>
-
-      <primitiveType>
-        <vodml-id>domain.spatial.SpatialCoord3D</vodml-id>
-        <name>SpatialCoord3D</name>
-        <description>
+        </literal>
+        <literal>
+          <vodml-id>domain.spatial.EpochType.B</vodml-id>
+          <name>B</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>stc2:domain.spatial.SpatialCoord</vodml-ref>
-        </extends>
-      </primitiveType>
+        </literal>
+      </enumeration>
 
       <enumeration>
         <vodml-id>domain.spatial.StdRefPosition</vodml-id>
@@ -2314,34 +2359,87 @@
         </literal>
       </enumeration>
 
-      <enumeration>
-        <vodml-id>domain.spatial.EpochType</vodml-id>
-        <name>EpochType</name>
+      <dataType abstract="true">
+        <vodml-id>domain.spatial.SpatialCoord</vodml-id>
+        <name>SpatialCoord</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <literal>
-          <vodml-id>domain.spatial.EpochType.J</vodml-id>
-          <name>J</name>
+      </dataType>
+
+      <dataType>
+        <vodml-id>domain.spatial.SpatialCoord1D</vodml-id>
+        <name>SpatialCoord1D</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>stc2:domain.spatial.SpatialCoord</vodml-ref>
+        </extends>
+        <attribute>
+          <vodml-id>domain.spatial.SpatialCoord1D.elem</vodml-id>
+          <name>elem</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        </literal>
-        <literal>
-          <vodml-id>domain.spatial.EpochType.B</vodml-id>
-          <name>B</name>
+          <datatype>
+            <vodml-ref>stc2:domain.spatial.AssociatedValue</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+      </dataType>
+
+      <dataType>
+        <vodml-id>domain.spatial.SpatialCoord2D</vodml-id>
+        <name>SpatialCoord2D</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>stc2:domain.spatial.SpatialCoord</vodml-ref>
+        </extends>
+        <attribute>
+          <vodml-id>domain.spatial.SpatialCoord2D.elem</vodml-id>
+          <name>elem</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        </literal>
-      </enumeration>
+          <datatype>
+            <vodml-ref>stc2:domain.spatial.AssociatedValue</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>2</minOccurs>
+            <maxOccurs>2</maxOccurs>
+          </multiplicity>
+        </attribute>
+      </dataType>
 
-      <dataType abstract="true">
-        <vodml-id>domain.spatial.SpatialCoord</vodml-id>
-        <name>SpatialCoord</name>
+      <dataType>
+        <vodml-id>domain.spatial.SpatialCoord3D</vodml-id>
+        <name>SpatialCoord3D</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
+        <extends>
+          <vodml-ref>stc2:domain.spatial.SpatialCoord</vodml-ref>
+        </extends>
+        <attribute>
+          <vodml-id>domain.spatial.SpatialCoord3D.elem</vodml-id>
+          <name>elem</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.spatial.AssociatedValue</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>3</minOccurs>
+            <maxOccurs>3</maxOccurs>
+          </multiplicity>
+        </attribute>
       </dataType>
 
       <dataType>
@@ -2380,6 +2478,42 @@
         </attribute>
       </dataType>
 
+      <dataType>
+        <vodml-id>domain.spatial.AssociatedValue</vodml-id>
+        <name>AssociatedValue</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <attribute>
+          <vodml-id>domain.spatial.AssociatedValue.loc</vodml-id>
+          <name>loc</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>ivoa:RealQuantity</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+        <reference>
+          <vodml-id>domain.spatial.AssociatedValue.axis</vodml-id>
+          <name>axis</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.spatial.CoordAxis</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>0</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </reference>
+      </dataType>
+
       <objectType abstract="true">
         <vodml-id>domain.spatial.SpaceBasis</vodml-id>
         <name>SpaceBasis</name>
@@ -3648,42 +3782,6 @@
         </attribute>
       </objectType>
 
-      <objectType>
-        <vodml-id>domain.spatial.AssociatedQuantity</vodml-id>
-        <name>AssociatedQuantity</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <attribute>
-          <vodml-id>domain.spatial.AssociatedQuantity.loc</vodml-id>
-          <name>loc</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>ivoa:RealQuantity</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-        <reference>
-          <vodml-id>domain.spatial.AssociatedQuantity.axis</vodml-id>
-          <name>axis</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>stc2:domain.spatial.CoordAxis</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>0</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </reference>
-      </objectType>
-
     </package>
 
 
@@ -3800,6 +3898,20 @@
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
+        <attribute>
+          <vodml-id>domain.temporal.TimeCoord.elem</vodml-id>
+          <name>elem</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.temporal.AssociatedValue</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
       </dataType>
 
       <dataType>
@@ -3809,7 +3921,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>stc2:domain.temporal.AssociatedQuantity</vodml-ref>
+          <vodml-ref>stc2:domain.temporal.AssociatedValue</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.temporal.TimeOffset.loc</vodml-id>
@@ -3834,7 +3946,7 @@
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>stc2:domain.temporal.AssociatedQuantity</vodml-ref>
+          <vodml-ref>stc2:domain.temporal.AssociatedValue</vodml-ref>
         </extends>
         <attribute>
           <vodml-id>domain.temporal.TimeInstant.loc</vodml-id>
@@ -3853,13 +3965,13 @@
       </dataType>
 
       <dataType>
-        <vodml-id>domain.temporal.AssociatedQuantity</vodml-id>
-        <name>AssociatedQuantity</name>
+        <vodml-id>domain.temporal.AssociatedValue</vodml-id>
+        <name>AssociatedValue</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <reference>
-          <vodml-id>domain.temporal.AssociatedQuantity.axis</vodml-id>
+          <vodml-id>domain.temporal.AssociatedValue.axis</vodml-id>
           <name>axis</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
@@ -3874,73 +3986,73 @@
         </reference>
       </dataType>
 
+      <objectType abstract="true">
+        <vodml-id>domain.temporal.TimeBasis</vodml-id>
+        <name>TimeBasis</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      </objectType>
+
       <objectType>
-        <vodml-id>domain.temporal.TimeFrame</vodml-id>
-        <name>TimeFrame</name>
+        <vodml-id>domain.temporal.StdTimeBasis</vodml-id>
+        <name>StdTimeBasis</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>stc2:coordsystem.CoordFrame</vodml-ref>
+          <vodml-ref>stc2:domain.temporal.TimeBasis</vodml-ref>
         </extends>
-        <collection>
-          <vodml-id>domain.temporal.TimeFrame.coordSpace</vodml-id>
-          <name>coordSpace</name>
+        <attribute>
+          <vodml-id>domain.temporal.StdTimeBasis.origin</vodml-id>
+          <name>origin</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.temporal.CoordSpace</vodml-ref>
+            <vodml-ref>stc2:domain.temporal.Calendar</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
-        </collection>
-        <reference>
-          <vodml-id>domain.temporal.TimeFrame.basis</vodml-id>
-          <name>basis</name>
+        </attribute>
+        <attribute>
+          <vodml-id>domain.temporal.StdTimeBasis.timescale</vodml-id>
+          <name>timescale</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.temporal.TimeBasis</vodml-ref>
+            <vodml-ref>stc2:domain.temporal.TimeScale</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
-        </reference>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.temporal.CoordAxis</vodml-id>
-        <name>CoordAxis</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
+        </attribute>
         <attribute>
-          <vodml-id>domain.temporal.CoordAxis.domainMin</vodml-id>
-          <name>domainMin</name>
+          <vodml-id>domain.temporal.StdTimeBasis.refPosition</vodml-id>
+          <name>refPosition</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>ivoa:RealQuantity</vodml-ref>
+            <vodml-ref>stc2:domain.spatial.StdRefPosition</vodml-ref>
           </datatype>
           <multiplicity>
-            <minOccurs>0</minOccurs>
+            <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
         <attribute>
-          <vodml-id>domain.temporal.CoordAxis.domainMax</vodml-id>
-          <name>domainMax</name>
+          <vodml-id>domain.temporal.StdTimeBasis.refDirection</vodml-id>
+          <name>refDirection</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>ivoa:RealQuantity</vodml-ref>
+            <vodml-ref>stc2:domain.spatial.SpatialCoord</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
@@ -3950,170 +4062,178 @@
       </objectType>
 
       <objectType>
-        <vodml-id>domain.temporal.Time</vodml-id>
-        <name>Time</name>
+        <vodml-id>domain.temporal.CustomTimeBasis</vodml-id>
+        <name>CustomTimeBasis</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
+        <extends>
+          <vodml-ref>stc2:domain.temporal.TimeBasis</vodml-ref>
+        </extends>
         <attribute>
-          <vodml-id>domain.temporal.Time.coord</vodml-id>
-          <name>coord</name>
+          <vodml-id>domain.temporal.CustomTimeBasis.offset</vodml-id>
+          <name>offset</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.temporal.TimeCoord</vodml-ref>
+            <vodml-ref>stc2:domain.temporal.TimeOffset</vodml-ref>
           </datatype>
           <multiplicity>
-            <minOccurs>1</minOccurs>
+            <minOccurs>0</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
-        <collection>
-          <vodml-id>domain.temporal.Time.error</vodml-id>
-          <name>error</name>
+        <attribute>
+          <vodml-id>domain.temporal.CustomTimeBasis.refPosition</vodml-id>
+          <name>refPosition</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.temporal.Uncertainty</vodml-ref>
+            <vodml-ref>stc2:domain.spatial.SpatialCoord</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
-            <maxOccurs>-1</maxOccurs>
+            <maxOccurs>1</maxOccurs>
           </multiplicity>
-        </collection>
-      </objectType>
-
-      <objectType abstract="true">
-        <vodml-id>domain.temporal.Uncertainty</vodml-id>
-        <name>Uncertainty</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <constraint>
-          <description>flavor MUST not repeat</description>
-        </constraint>
-        <attribute>
-          <vodml-id>domain.temporal.Uncertainty.flavor</vodml-id>
-          <name>flavor</name>
+        </attribute>
+        <reference>
+          <vodml-id>domain.temporal.CustomTimeBasis.basis</vodml-id>
+          <name>basis</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>ivoa:string</vodml-ref>
+            <vodml-ref>stc2:domain.temporal.TimeBasis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
-        </attribute>
+        </reference>
       </objectType>
 
       <objectType>
-        <vodml-id>domain.temporal.Bounds</vodml-id>
-        <name>Bounds</name>
+        <vodml-id>domain.temporal.TimeFrame</vodml-id>
+        <name>TimeFrame</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>stc2:domain.temporal.Uncertainty</vodml-ref>
+          <vodml-ref>stc2:coordsystem.CoordFrame</vodml-ref>
         </extends>
-        <attribute>
-          <vodml-id>domain.temporal.Bounds.hiLimit</vodml-id>
-          <name>hiLimit</name>
+        <collection>
+          <vodml-id>domain.temporal.TimeFrame.coordSpace</vodml-id>
+          <name>coordSpace</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.temporal.TimeCoord</vodml-ref>
+            <vodml-ref>stc2:domain.temporal.CoordSpace</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
-        </attribute>
-        <attribute>
-          <vodml-id>domain.temporal.Bounds.loLimit</vodml-id>
-          <name>loLimit</name>
+        </collection>
+        <reference>
+          <vodml-id>domain.temporal.TimeFrame.basis</vodml-id>
+          <name>basis</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.temporal.TimeCoord</vodml-ref>
+            <vodml-ref>stc2:domain.temporal.TimeBasis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
-        </attribute>
+        </reference>
       </objectType>
 
-      <objectType>
-        <vodml-id>domain.temporal.SymmetricInterval</vodml-id>
-        <name>SymmetricInterval</name>
+      <objectType abstract="true">
+        <vodml-id>domain.temporal.CoordSpace</vodml-id>
+        <name>CoordSpace</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>stc2:domain.temporal.Uncertainty</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.temporal.SymmetricInterval.center</vodml-id>
-          <name>center</name>
+        <collection>
+          <vodml-id>domain.temporal.CoordSpace.axis</vodml-id>
+          <name>axis</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.temporal.TimeCoord</vodml-ref>
+            <vodml-ref>stc2:domain.temporal.CoordAxis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
-        </attribute>
-        <attribute>
-          <vodml-id>domain.temporal.SymmetricInterval.size</vodml-id>
-          <name>size</name>
+        </collection>
+      </objectType>
+
+      <objectType abstract="true">
+        <vodml-id>domain.temporal.Cartesian</vodml-id>
+        <name>Cartesian</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>stc2:domain.temporal.CoordSpace</vodml-ref>
+        </extends>
+      </objectType>
+
+      <objectType>
+        <vodml-id>domain.temporal.TimeSpace</vodml-id>
+        <name>TimeSpace</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>stc2:domain.temporal.Cartesian</vodml-ref>
+        </extends>
+        <reference>
+          <vodml-id>domain.temporal.TimeSpace.t</vodml-id>
+          <name>t</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>ivoa:RealQuantity</vodml-ref>
+            <vodml-ref>stc2:domain.temporal.CoordAxis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
-        </attribute>
+        </reference>
       </objectType>
 
       <objectType>
-        <vodml-id>domain.temporal.AssymetricInterval</vodml-id>
-        <name>AssymetricInterval</name>
+        <vodml-id>domain.temporal.CoordAxis</vodml-id>
+        <name>CoordAxis</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>stc2:domain.temporal.Uncertainty</vodml-ref>
-        </extends>
         <attribute>
-          <vodml-id>domain.temporal.AssymetricInterval.center</vodml-id>
-          <name>center</name>
+          <vodml-id>domain.temporal.CoordAxis.domainMin</vodml-id>
+          <name>domainMin</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.temporal.TimeCoord</vodml-ref>
+            <vodml-ref>ivoa:RealQuantity</vodml-ref>
           </datatype>
           <multiplicity>
-            <minOccurs>1</minOccurs>
+            <minOccurs>0</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
         <attribute>
-          <vodml-id>domain.temporal.AssymetricInterval.plus</vodml-id>
-          <name>plus</name>
+          <vodml-id>domain.temporal.CoordAxis.domainMax</vodml-id>
+          <name>domainMax</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -4121,51 +4241,90 @@
             <vodml-ref>ivoa:RealQuantity</vodml-ref>
           </datatype>
           <multiplicity>
-            <minOccurs>1</minOccurs>
+            <minOccurs>0</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
+      </objectType>
+
+      <objectType>
+        <vodml-id>domain.temporal.Time</vodml-id>
+        <name>Time</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
         <attribute>
-          <vodml-id>domain.temporal.AssymetricInterval.minus</vodml-id>
-          <name>minus</name>
+          <vodml-id>domain.temporal.Time.coord</vodml-id>
+          <name>coord</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>ivoa:RealQuantity</vodml-ref>
+            <vodml-ref>stc2:domain.temporal.TimeCoord</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
+        <collection>
+          <vodml-id>domain.temporal.Time.error</vodml-id>
+          <name>error</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.temporal.Uncertainty</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>0</minOccurs>
+            <maxOccurs>-1</maxOccurs>
+          </multiplicity>
+        </collection>
       </objectType>
 
       <objectType abstract="true">
-        <vodml-id>domain.temporal.TimeBasis</vodml-id>
-        <name>TimeBasis</name>
+        <vodml-id>domain.temporal.Uncertainty</vodml-id>
+        <name>Uncertainty</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
+        <constraint>
+          <description>flavor MUST not repeat</description>
+        </constraint>
+        <attribute>
+          <vodml-id>domain.temporal.Uncertainty.flavor</vodml-id>
+          <name>flavor</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>ivoa:string</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
       </objectType>
 
       <objectType>
-        <vodml-id>domain.temporal.StdTimeBasis</vodml-id>
-        <name>StdTimeBasis</name>
+        <vodml-id>domain.temporal.Bounds</vodml-id>
+        <name>Bounds</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>stc2:domain.temporal.TimeBasis</vodml-ref>
+          <vodml-ref>stc2:domain.temporal.Uncertainty</vodml-ref>
         </extends>
         <attribute>
-          <vodml-id>domain.temporal.StdTimeBasis.origin</vodml-id>
-          <name>origin</name>
+          <vodml-id>domain.temporal.Bounds.hiLimit</vodml-id>
+          <name>hiLimit</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.temporal.Calendar</vodml-ref>
+            <vodml-ref>stc2:domain.temporal.TimeCoord</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -4173,27 +4332,38 @@
           </multiplicity>
         </attribute>
         <attribute>
-          <vodml-id>domain.temporal.StdTimeBasis.timescale</vodml-id>
-          <name>timescale</name>
+          <vodml-id>domain.temporal.Bounds.loLimit</vodml-id>
+          <name>loLimit</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.temporal.TimeScale</vodml-ref>
+            <vodml-ref>stc2:domain.temporal.TimeCoord</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
+      </objectType>
+
+      <objectType>
+        <vodml-id>domain.temporal.SymmetricInterval</vodml-id>
+        <name>SymmetricInterval</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>stc2:domain.temporal.Uncertainty</vodml-ref>
+        </extends>
         <attribute>
-          <vodml-id>domain.temporal.StdTimeBasis.refPosition</vodml-id>
-          <name>refPosition</name>
+          <vodml-id>domain.temporal.SymmetricInterval.center</vodml-id>
+          <name>center</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.spatial.StdRefPosition</vodml-ref>
+            <vodml-ref>stc2:domain.temporal.TimeCoord</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -4201,127 +4371,207 @@
           </multiplicity>
         </attribute>
         <attribute>
-          <vodml-id>domain.temporal.StdTimeBasis.refDirection</vodml-id>
-          <name>refDirection</name>
+          <vodml-id>domain.temporal.SymmetricInterval.size</vodml-id>
+          <name>size</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.spatial.SpatialCoord</vodml-ref>
+            <vodml-ref>ivoa:RealQuantity</vodml-ref>
           </datatype>
           <multiplicity>
-            <minOccurs>0</minOccurs>
+            <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
       </objectType>
 
       <objectType>
-        <vodml-id>domain.temporal.CustomTimeBasis</vodml-id>
-        <name>CustomTimeBasis</name>
+        <vodml-id>domain.temporal.AssymetricInterval</vodml-id>
+        <name>AssymetricInterval</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>stc2:domain.temporal.TimeBasis</vodml-ref>
+          <vodml-ref>stc2:domain.temporal.Uncertainty</vodml-ref>
         </extends>
         <attribute>
-          <vodml-id>domain.temporal.CustomTimeBasis.offset</vodml-id>
-          <name>offset</name>
+          <vodml-id>domain.temporal.AssymetricInterval.center</vodml-id>
+          <name>center</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.temporal.TimeOffset</vodml-ref>
+            <vodml-ref>stc2:domain.temporal.TimeCoord</vodml-ref>
           </datatype>
           <multiplicity>
-            <minOccurs>0</minOccurs>
+            <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
         <attribute>
-          <vodml-id>domain.temporal.CustomTimeBasis.refPosition</vodml-id>
-          <name>refPosition</name>
+          <vodml-id>domain.temporal.AssymetricInterval.plus</vodml-id>
+          <name>plus</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.spatial.SpatialCoord</vodml-ref>
+            <vodml-ref>ivoa:RealQuantity</vodml-ref>
           </datatype>
           <multiplicity>
-            <minOccurs>0</minOccurs>
+            <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
-        <reference>
-          <vodml-id>domain.temporal.CustomTimeBasis.basis</vodml-id>
-          <name>basis</name>
+        <attribute>
+          <vodml-id>domain.temporal.AssymetricInterval.minus</vodml-id>
+          <name>minus</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.temporal.TimeBasis</vodml-ref>
+            <vodml-ref>ivoa:RealQuantity</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
-        </reference>
+        </attribute>
       </objectType>
 
-      <objectType abstract="true">
-        <vodml-id>domain.temporal.CoordSpace</vodml-id>
-        <name>CoordSpace</name>
+    </package>
+
+
+
+    <package>
+      <vodml-id>domain.spectral</vodml-id>
+      <name>spectral</name>
+      <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      <dataType>
+        <vodml-id>domain.spectral.SpectralCoord</vodml-id>
+        <name>SpectralCoord</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <collection>
-          <vodml-id>domain.temporal.CoordSpace.axis</vodml-id>
-          <name>axis</name>
+        <attribute>
+          <vodml-id>domain.spectral.SpectralCoord.elem</vodml-id>
+          <name>elem</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.temporal.CoordAxis</vodml-ref>
+            <vodml-ref>stc2:domain.spectral.AssociatedValue</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
-        </collection>
-      </objectType>
+        </attribute>
+      </dataType>
+
+      <dataType>
+        <vodml-id>domain.spectral.AssociatedValue</vodml-id>
+        <name>AssociatedValue</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <attribute>
+          <vodml-id>domain.spectral.AssociatedValue.loc</vodml-id>
+          <name>loc</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>ivoa:RealQuantity</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+        <reference>
+          <vodml-id>domain.spectral.AssociatedValue.axis</vodml-id>
+          <name>axis</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.spectral.CoordAxis</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>0</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </reference>
+      </dataType>
 
       <objectType abstract="true">
-        <vodml-id>domain.temporal.Cartesian</vodml-id>
-        <name>Cartesian</name>
+        <vodml-id>domain.spectral.SpectralBasis</vodml-id>
+        <name>SpectralBasis</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
+      </objectType>
+
+      <objectType>
+        <vodml-id>domain.spectral.StdSpectralBasis</vodml-id>
+        <name>StdSpectralBasis</name>
+        <description>origin: 0.0
+dimensionality: 1D
+orientation: irrelevant
+</description>
         <extends>
-          <vodml-ref>stc2:domain.temporal.CoordSpace</vodml-ref>
+          <vodml-ref>stc2:domain.spectral.SpectralBasis</vodml-ref>
         </extends>
+        <attribute>
+          <vodml-id>domain.spectral.StdSpectralBasis.refPosition</vodml-id>
+          <name>refPosition</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.spatial.StdRefPosition</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
       </objectType>
 
       <objectType>
-        <vodml-id>domain.temporal.TimeSpace</vodml-id>
-        <name>TimeSpace</name>
+        <vodml-id>domain.spectral.SpectralFrame</vodml-id>
+        <name>SpectralFrame</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <extends>
-          <vodml-ref>stc2:domain.temporal.Cartesian</vodml-ref>
+          <vodml-ref>stc2:coordsystem.CoordFrame</vodml-ref>
         </extends>
-        <constraint>
-          <description>axis:CoordAxis[1]</description>
-        </constraint>
+        <collection>
+          <vodml-id>domain.spectral.SpectralFrame.coordSpace</vodml-id>
+          <name>coordSpace</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.spectral.CoordSpace</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </collection>
         <reference>
-          <vodml-id>domain.temporal.TimeSpace.t</vodml-id>
-          <name>t</name>
+          <vodml-id>domain.spectral.SpectralFrame.basis</vodml-id>
+          <name>basis</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.temporal.CoordAxis</vodml-ref>
+            <vodml-ref>stc2:domain.spectral.SpectralBasis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -4330,33 +4580,15 @@
         </reference>
       </objectType>
 
-    </package>
-
-
-
-    <package>
-      <vodml-id>domain.spectral</vodml-id>
-      <name>spectral</name>
-      <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-      <dataType>
-        <vodml-id>domain.spectral.SpectralCoord</vodml-id>
-        <name>SpectralCoord</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-      </dataType>
-
-      <dataType>
-        <vodml-id>domain.spectral.AssociatedQuantity</vodml-id>
-        <name>AssociatedQuantity</name>
+      <objectType>
+        <vodml-id>domain.spectral.CoordAxis</vodml-id>
+        <name>CoordAxis</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
         <attribute>
-          <vodml-id>domain.spectral.AssociatedQuantity.loc</vodml-id>
-          <name>loc</name>
+          <vodml-id>domain.spectral.CoordAxis.domainMin</vodml-id>
+          <name>domainMin</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
@@ -4364,57 +4596,76 @@
             <vodml-ref>ivoa:RealQuantity</vodml-ref>
           </datatype>
           <multiplicity>
-            <minOccurs>1</minOccurs>
+            <minOccurs>0</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </attribute>
-        <reference>
-          <vodml-id>domain.spectral.AssociatedQuantity.axis</vodml-id>
-          <name>axis</name>
+        <attribute>
+          <vodml-id>domain.spectral.CoordAxis.domainMax</vodml-id>
+          <name>domainMax</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.spectral.CoordAxis</vodml-ref>
+            <vodml-ref>ivoa:RealQuantity</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>0</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
-        </reference>
-      </dataType>
+        </attribute>
+      </objectType>
 
-      <objectType>
-        <vodml-id>domain.spectral.SpectralFrame</vodml-id>
-        <name>SpectralFrame</name>
+      <objectType abstract="true">
+        <vodml-id>domain.spectral.CoordSpace</vodml-id>
+        <name>CoordSpace</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>stc2:coordsystem.CoordFrame</vodml-ref>
-        </extends>
         <collection>
-          <vodml-id>domain.spectral.SpectralFrame.coordSpace</vodml-id>
-          <name>coordSpace</name>
+          <vodml-id>domain.spectral.CoordSpace.axis</vodml-id>
+          <name>axis</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.spectral.CoordSpace</vodml-ref>
+            <vodml-ref>stc2:domain.spectral.CoordAxis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
         </collection>
+      </objectType>
+
+      <objectType abstract="true">
+        <vodml-id>domain.spectral.Cartesian</vodml-id>
+        <name>Cartesian</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>stc2:domain.spectral.CoordSpace</vodml-ref>
+        </extends>
+      </objectType>
+
+      <objectType>
+        <vodml-id>domain.spectral.EnergySpace</vodml-id>
+        <name>EnergySpace</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>stc2:domain.spectral.Cartesian</vodml-ref>
+        </extends>
         <reference>
-          <vodml-id>domain.spectral.SpectralFrame.basis</vodml-id>
-          <name>basis</name>
+          <vodml-id>domain.spectral.EnergySpace.energy</vodml-id>
+          <name>energy</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>stc2:domain.spectral.SpectralBasis</vodml-ref>
+            <vodml-ref>stc2:domain.spectral.CoordAxis</vodml-ref>
           </datatype>
           <multiplicity>
             <minOccurs>1</minOccurs>
@@ -4424,39 +4675,53 @@
       </objectType>
 
       <objectType>
-        <vodml-id>domain.spectral.CoordAxis</vodml-id>
-        <name>CoordAxis</name>
+        <vodml-id>domain.spectral.FrequencySpace</vodml-id>
+        <name>FrequencySpace</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <attribute>
-          <vodml-id>domain.spectral.CoordAxis.domainMin</vodml-id>
-          <name>domainMin</name>
+        <extends>
+          <vodml-ref>stc2:domain.spectral.Cartesian</vodml-ref>
+        </extends>
+        <reference>
+          <vodml-id>domain.spectral.FrequencySpace.freq</vodml-id>
+          <name>freq</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>ivoa:RealQuantity</vodml-ref>
+            <vodml-ref>stc2:domain.spectral.CoordAxis</vodml-ref>
           </datatype>
           <multiplicity>
-            <minOccurs>0</minOccurs>
+            <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
-        </attribute>
-        <attribute>
-          <vodml-id>domain.spectral.CoordAxis.domainMax</vodml-id>
-          <name>domainMax</name>
+        </reference>
+      </objectType>
+
+      <objectType>
+        <vodml-id>domain.spectral.WavelengthSpace</vodml-id>
+        <name>WavelengthSpace</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>stc2:domain.spectral.Cartesian</vodml-ref>
+        </extends>
+        <reference>
+          <vodml-id>domain.spectral.WavelengthSpace.wavelength</vodml-id>
+          <name>wavelength</name>
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
           <datatype>
-            <vodml-ref>ivoa:RealQuantity</vodml-ref>
+            <vodml-ref>stc2:domain.spectral.CoordAxis</vodml-ref>
           </datatype>
           <multiplicity>
-            <minOccurs>0</minOccurs>
+            <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
-        </attribute>
+        </reference>
       </objectType>
 
       <objectType abstract="true">
@@ -4495,6 +4760,39 @@
         </collection>
       </objectType>
 
+      <objectType>
+        <vodml-id>domain.spectral.Energy</vodml-id>
+        <name>Energy</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>stc2:domain.spectral.DerivedSpectralCoordinate</vodml-ref>
+        </extends>
+      </objectType>
+
+      <objectType>
+        <vodml-id>domain.spectral.Frequency</vodml-id>
+        <name>Frequency</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>stc2:domain.spectral.DerivedSpectralCoordinate</vodml-ref>
+        </extends>
+      </objectType>
+
+      <objectType>
+        <vodml-id>domain.spectral.Wavelength</vodml-id>
+        <name>Wavelength</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>stc2:domain.spectral.DerivedSpectralCoordinate</vodml-ref>
+        </extends>
+      </objectType>
+
       <objectType abstract="true">
         <vodml-id>domain.spectral.Uncertainty</vodml-id>
         <name>Uncertainty</name>
@@ -4648,182 +4946,7 @@
             <minOccurs>1</minOccurs>
             <maxOccurs>1</maxOccurs>
           </multiplicity>
-        </attribute>
-      </objectType>
-
-      <objectType abstract="true">
-        <vodml-id>domain.spectral.SpectralBasis</vodml-id>
-        <name>SpectralBasis</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spectral.StdSpectralBasis</vodml-id>
-        <name>StdSpectralBasis</name>
-        <description>origin: 0.0
-dimensionality: 1D
-orientation: irrelevant
-</description>
-        <extends>
-          <vodml-ref>stc2:domain.spectral.SpectralBasis</vodml-ref>
-        </extends>
-        <attribute>
-          <vodml-id>domain.spectral.StdSpectralBasis.refPosition</vodml-id>
-          <name>refPosition</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>stc2:domain.spatial.StdRefPosition</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-      </objectType>
-
-      <objectType abstract="true">
-        <vodml-id>domain.spectral.CoordSpace</vodml-id>
-        <name>CoordSpace</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <collection>
-          <vodml-id>domain.spectral.CoordSpace.axis</vodml-id>
-          <name>axis</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>stc2:domain.spectral.CoordAxis</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </collection>
-      </objectType>
-
-      <objectType abstract="true">
-        <vodml-id>domain.spectral.Cartesian</vodml-id>
-        <name>Cartesian</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>stc2:domain.spectral.CoordSpace</vodml-ref>
-        </extends>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spectral.EnergySpace</vodml-id>
-        <name>EnergySpace</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>stc2:domain.spectral.Cartesian</vodml-ref>
-        </extends>
-        <reference>
-          <vodml-id>domain.spectral.EnergySpace.energy</vodml-id>
-          <name>energy</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>stc2:domain.spectral.CoordAxis</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </reference>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spectral.FrequencySpace</vodml-id>
-        <name>FrequencySpace</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>stc2:domain.spectral.Cartesian</vodml-ref>
-        </extends>
-        <reference>
-          <vodml-id>domain.spectral.FrequencySpace.freq</vodml-id>
-          <name>freq</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>stc2:domain.spectral.CoordAxis</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </reference>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spectral.WavelengthSpace</vodml-id>
-        <name>WavelengthSpace</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>stc2:domain.spectral.Cartesian</vodml-ref>
-        </extends>
-        <reference>
-          <vodml-id>domain.spectral.WavelengthSpace.wavelength</vodml-id>
-          <name>wavelength</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>stc2:domain.spectral.CoordAxis</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </reference>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spectral.Frequency</vodml-id>
-        <name>Frequency</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>stc2:domain.spectral.DerivedSpectralCoordinate</vodml-ref>
-        </extends>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spectral.Wavelength</vodml-id>
-        <name>Wavelength</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>stc2:domain.spectral.DerivedSpectralCoordinate</vodml-ref>
-        </extends>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.spectral.Energy</vodml-id>
-        <name>Energy</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <extends>
-          <vodml-ref>stc2:domain.spectral.DerivedSpectralCoordinate</vodml-ref>
-        </extends>
+        </attribute>
       </objectType>
 
     </package>
@@ -4878,6 +5001,56 @@
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
+        <attribute>
+          <vodml-id>domain.redshift.RedshiftCoord.elem</vodml-id>
+          <name>elem</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.redshift.AssociatedValue</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+      </dataType>
+
+      <dataType>
+        <vodml-id>domain.redshift.AssociatedValue</vodml-id>
+        <name>AssociatedValue</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <attribute>
+          <vodml-id>domain.redshift.AssociatedValue.loc</vodml-id>
+          <name>loc</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>ivoa:RealQuantity</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+        <reference>
+          <vodml-id>domain.redshift.AssociatedValue.axis</vodml-id>
+          <name>axis</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.redshift.CoordAxis</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>0</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </reference>
       </dataType>
 
       <objectType abstract="true">
@@ -4929,42 +5102,6 @@
       </objectType>
 
       <objectType>
-        <vodml-id>domain.redshift.AssociatedQuantity</vodml-id>
-        <name>AssociatedQuantity</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <attribute>
-          <vodml-id>domain.redshift.AssociatedQuantity.loc</vodml-id>
-          <name>loc</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>ivoa:RealQuantity</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-        <reference>
-          <vodml-id>domain.redshift.AssociatedQuantity.axis</vodml-id>
-          <name>axis</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>stc2:domain.redshift.CoordAxis</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>0</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </reference>
-      </objectType>
-
-      <objectType>
         <vodml-id>domain.redshift.RedshiftFrame</vodml-id>
         <name>RedshiftFrame</name>
         <description>
@@ -5462,59 +5599,259 @@
           <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        </literal>
-      </enumeration>
-
-      <dataType>
-        <vodml-id>domain.polarization.PolStokesCoord</vodml-id>
-        <name>PolStokesCoord</name>
-        <description>
+        </literal>
+      </enumeration>
+
+      <dataType>
+        <vodml-id>domain.polarization.PolStokesCoord</vodml-id>
+        <name>PolStokesCoord</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>stc2:domain.polarization.PolCoord</vodml-ref>
+        </extends>
+        <attribute>
+          <vodml-id>domain.polarization.PolStokesCoord.elem</vodml-id>
+          <name>elem</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.polarization.AssociatedStokesPol</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+      </dataType>
+
+      <dataType>
+        <vodml-id>domain.polarization.PolCircularCoord</vodml-id>
+        <name>PolCircularCoord</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>stc2:domain.polarization.PolCoord</vodml-ref>
+        </extends>
+        <attribute>
+          <vodml-id>domain.polarization.PolCircularCoord.elem</vodml-id>
+          <name>elem</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.polarization.AssociatedCircularPol</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+      </dataType>
+
+      <dataType>
+        <vodml-id>domain.polarization.PolLinearCoord</vodml-id>
+        <name>PolLinearCoord</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>stc2:domain.polarization.PolCoord</vodml-ref>
+        </extends>
+        <attribute>
+          <vodml-id>domain.polarization.PolLinearCoord.elem</vodml-id>
+          <name>elem</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.polarization.AssociatedLinearPol</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+      </dataType>
+
+      <dataType>
+        <vodml-id>domain.polarization.PolVectorCoord</vodml-id>
+        <name>PolVectorCoord</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <extends>
+          <vodml-ref>stc2:domain.polarization.PolCoord</vodml-ref>
+        </extends>
+        <attribute>
+          <vodml-id>domain.polarization.PolVectorCoord.elem</vodml-id>
+          <name>elem</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.polarization.AssociatedVectorPol</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+      </dataType>
+
+      <dataType abstract="true">
+        <vodml-id>domain.polarization.PolCoord</vodml-id>
+        <name>PolCoord</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+      </dataType>
+
+      <dataType>
+        <vodml-id>domain.polarization.AssociatedStokesPol</vodml-id>
+        <name>AssociatedStokesPol</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <attribute>
+          <vodml-id>domain.polarization.AssociatedStokesPol.loc</vodml-id>
+          <name>loc</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.polarization.PolStokes</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+        <reference>
+          <vodml-id>domain.polarization.AssociatedStokesPol.axis</vodml-id>
+          <name>axis</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.polarization.DiscreteAxis</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>0</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </reference>
+      </dataType>
+
+      <dataType>
+        <vodml-id>domain.polarization.AssociatedCircularPol</vodml-id>
+        <name>AssociatedCircularPol</name>
+        <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+        <attribute>
+          <vodml-id>domain.polarization.AssociatedCircularPol.loc</vodml-id>
+          <name>loc</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.polarization.PolCircular</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+        <reference>
+          <vodml-id>domain.polarization.AssociatedCircularPol.axis</vodml-id>
+          <name>axis</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>stc2:domain.polarization.PolCoord</vodml-ref>
-        </extends>
+          <datatype>
+            <vodml-ref>stc2:domain.polarization.DiscreteAxis</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>0</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </reference>
       </dataType>
 
       <dataType>
-        <vodml-id>domain.polarization.PolCircularCoord</vodml-id>
-        <name>PolCircularCoord</name>
+        <vodml-id>domain.polarization.AssociatedLinearPol</vodml-id>
+        <name>AssociatedLinearPol</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>stc2:domain.polarization.PolCoord</vodml-ref>
-        </extends>
-      </dataType>
-
-      <dataType>
-        <vodml-id>domain.polarization.PolLinearCoord</vodml-id>
-        <name>PolLinearCoord</name>
-        <description>
+        <attribute>
+          <vodml-id>domain.polarization.AssociatedLinearPol.loc</vodml-id>
+          <name>loc</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>stc2:domain.polarization.PolCoord</vodml-ref>
-        </extends>
+          <datatype>
+            <vodml-ref>stc2:domain.polarization.PolLinear</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+        <reference>
+          <vodml-id>domain.polarization.AssociatedLinearPol.axis</vodml-id>
+          <name>axis</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.polarization.DiscreteAxis</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>0</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </reference>
       </dataType>
 
       <dataType>
-        <vodml-id>domain.polarization.PolVectorCoord</vodml-id>
-        <name>PolVectorCoord</name>
+        <vodml-id>domain.polarization.AssociatedVectorPol</vodml-id>
+        <name>AssociatedVectorPol</name>
         <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
-        <extends>
-          <vodml-ref>stc2:domain.polarization.PolCoord</vodml-ref>
-        </extends>
-      </dataType>
-
-      <dataType abstract="true">
-        <vodml-id>domain.polarization.PolCoord</vodml-id>
-        <name>PolCoord</name>
-        <description>
+        <attribute>
+          <vodml-id>domain.polarization.AssociatedVectorPol.loc</vodml-id>
+          <name>loc</name>
+          <description>
+          TODO : Missing description : please, update your UML model asap.
+        </description>
+          <datatype>
+            <vodml-ref>stc2:domain.polarization.PolVector</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>1</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </attribute>
+        <reference>
+          <vodml-id>domain.polarization.AssociatedVectorPol.axis</vodml-id>
+          <name>axis</name>
+          <description>
           TODO : Missing description : please, update your UML model asap.
         </description>
+          <datatype>
+            <vodml-ref>stc2:domain.polarization.DiscreteAxis</vodml-ref>
+          </datatype>
+          <multiplicity>
+            <minOccurs>0</minOccurs>
+            <maxOccurs>1</maxOccurs>
+          </multiplicity>
+        </reference>
       </dataType>
 
       <objectType abstract="true">
@@ -5685,150 +6022,6 @@
         </description>
       </objectType>
 
-      <objectType>
-        <vodml-id>domain.polarization.AssociatedStokesPol</vodml-id>
-        <name>AssociatedStokesPol</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <attribute>
-          <vodml-id>domain.polarization.AssociatedStokesPol.loc</vodml-id>
-          <name>loc</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>stc2:domain.polarization.PolStokes</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-        <reference>
-          <vodml-id>domain.polarization.AssociatedStokesPol.axis</vodml-id>
-          <name>axis</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>stc2:domain.polarization.DiscreteAxis</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>0</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </reference>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.polarization.AssociatedCircularPol</vodml-id>
-        <name>AssociatedCircularPol</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <attribute>
-          <vodml-id>domain.polarization.AssociatedCircularPol.loc</vodml-id>
-          <name>loc</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>stc2:domain.polarization.PolCircular</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-        <reference>
-          <vodml-id>domain.polarization.AssociatedCircularPol.axis</vodml-id>
-          <name>axis</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>stc2:domain.polarization.DiscreteAxis</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>0</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </reference>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.polarization.AssociatedLinearPol</vodml-id>
-        <name>AssociatedLinearPol</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <attribute>
-          <vodml-id>domain.polarization.AssociatedLinearPol.loc</vodml-id>
-          <name>loc</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>stc2:domain.polarization.PolLinear</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-        <reference>
-          <vodml-id>domain.polarization.AssociatedLinearPol.axis</vodml-id>
-          <name>axis</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>stc2:domain.polarization.DiscreteAxis</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>0</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </reference>
-      </objectType>
-
-      <objectType>
-        <vodml-id>domain.polarization.AssociatedVectorPol</vodml-id>
-        <name>AssociatedVectorPol</name>
-        <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-        <attribute>
-          <vodml-id>domain.polarization.AssociatedVectorPol.loc</vodml-id>
-          <name>loc</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>stc2:domain.polarization.PolVector</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>1</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </attribute>
-        <reference>
-          <vodml-id>domain.polarization.AssociatedVectorPol.axis</vodml-id>
-          <name>axis</name>
-          <description>
-          TODO : Missing description : please, update your UML model asap.
-        </description>
-          <datatype>
-            <vodml-ref>stc2:domain.polarization.DiscreteAxis</vodml-ref>
-          </datatype>
-          <multiplicity>
-            <minOccurs>0</minOccurs>
-            <maxOccurs>1</maxOccurs>
-          </multiplicity>
-        </reference>
-      </objectType>
-
       <objectType abstract="true">
         <vodml-id>domain.polarization.DerivedPolarizationCoordinate</vodml-id>
         <name>DerivedPolarizationCoordinate</name>

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

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

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

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

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

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

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

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

Modified: trunk/projects/dm/vo-dml/models/STC2/prototype/stc2_pattern_uml2p4p1.xmi
==============================================================================
--- trunk/projects/dm/vo-dml/models/STC2/prototype/stc2_pattern_uml2p4p1.xmi	Thu Sep 29 09:16:08 2016	(r3586)
+++ trunk/projects/dm/vo-dml/models/STC2/prototype/stc2_pattern_uml2p4p1.xmi	Thu Sep 29 22:25:49 2016	(r3587)
@@ -1,1571 +1,1557 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:IVOA_UML_Profile="http:///schemas/IVOA_UML_Profile/_yQejYIWzEeaFx5FBVhZ7AQ/0" xmlns:default="http:///schemas/default/_yRWtIIWzEeaFx5FBVhZ7AQ/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.omg.org/spec/UML/20100901" xmi:version="2.1" xsi:schemaLocation="http://www.eclipse.org/uml2/3.0.0/UML http://schema.omg.org/spec/UML/20100901 http:///schemas/IVOA_UML_Profile/_yQejYIWzEeaFx5FBVhZ7AQ/0 IVOA_UML_Profile.profile.xmi#_yRw814WzEeaFx5FBVhZ7AQ http:///schemas/default/_yRWtIIWzEeaFx5FBVhZ7AQ/0 default.profile.xmi#_yect94WzEeaFx5FBVhZ7AQ">
-  <uml:Model xmi:id="_yQE6wIWzEeaFx5FBVhZ7AQ" name="stc2">
-    <eAnnotations xmi:id="_yQE6wYWzEeaFx5FBVhZ7AQ" source="Objing">
-      <contents xmi:type="uml:Property" xmi:id="_yQE6woWzEeaFx5FBVhZ7AQ" name="exporterVersion">
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQE6w4WzEeaFx5FBVhZ7AQ" value="3.0.0"/>
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:IVOA_UML_Profile="http:///schemas/IVOA_UML_Profile/_yhQpm4aBEeaVYIZzHZR7BA/0" xmlns:default="http:///schemas/default/_yh3CsIaBEeaVYIZzHZR7BA/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.omg.org/spec/UML/20100901" xmi:version="2.1" xsi:schemaLocation="http://www.eclipse.org/uml2/3.0.0/UML http://schema.omg.org/spec/UML/20100901 http:///schemas/IVOA_UML_Profile/_yhQpm4aBEeaVYIZzHZR7BA/0 IVOA_UML_Profile.profile.xmi#_yiTup4aBEeaVYIZzHZR7BA http:///schemas/default/_yh3CsIaBEeaVYIZzHZR7BA/0 default.profile.xmi#_yvHbl4aBEeaVYIZzHZR7BA">
+  <uml:Model xmi:id="_yg9q0IaBEeaVYIZzHZR7BA" name="stc2">
+    <eAnnotations xmi:id="_yhG0wIaBEeaVYIZzHZR7BA" source="Objing">
+      <contents xmi:type="uml:Property" xmi:id="_yhG0wYaBEeaVYIZzHZR7BA" name="exporterVersion">
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG0woaBEeaVYIZzHZR7BA" value="3.0.0"/>
       </contents>
-      <contents xmi:type="uml:Property" xmi:id="_yQE6xIWzEeaFx5FBVhZ7AQ" name="isRoundTrip"/>
-      <contents xmi:type="uml:Property" xmi:id="_yQE6xYWzEeaFx5FBVhZ7AQ" name="Visibility">
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQE6xoWzEeaFx5FBVhZ7AQ" value="0"/>
+      <contents xmi:type="uml:Property" xmi:id="_yhG0w4aBEeaVYIZzHZR7BA" name="isRoundTrip"/>
+      <contents xmi:type="uml:Property" xmi:id="_yhG0xIaBEeaVYIZzHZR7BA" name="Visibility">
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG0xYaBEeaVYIZzHZR7BA" value="0"/>
       </contents>
     </eAnnotations>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE6x4WzEeaFx5FBVhZ7AQ" constrainedElement="_yQJzWIWzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE6yIWzEeaFx5FBVhZ7AQ" value="elem:AssociatedQuantity[1]"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_yhG0xoaBEeaVYIZzHZR7BA" constrainedElement="_yhG4_YaBEeaVYIZzHZR7BA">
+      <specification xmi:type="uml:LiteralString" xmi:id="_yhG0x4aBEeaVYIZzHZR7BA" value="flavor MUST not repeat"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE6yYWzEeaFx5FBVhZ7AQ" constrainedElement="_yQJzXoWzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE6yoWzEeaFx5FBVhZ7AQ" value="elem:AssociatedQuantity[3]"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_yhG0yIaBEeaVYIZzHZR7BA" constrainedElement="_yhG5sIaBEeaVYIZzHZR7BA">
+      <specification xmi:type="uml:LiteralString" xmi:id="_yhG0yYaBEeaVYIZzHZR7BA" value="axis:CoordAxis[3]"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE6y4WzEeaFx5FBVhZ7AQ" constrainedElement="_yQJzZIWzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE6zIWzEeaFx5FBVhZ7AQ" value="elem:AssociatedQuantity[2]"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_yhG0yoaBEeaVYIZzHZR7BA" constrainedElement="_yhG534aBEeaVYIZzHZR7BA">
+      <specification xmi:type="uml:LiteralString" xmi:id="_yhG0y4aBEeaVYIZzHZR7BA" value="axis:CoordAxis[2]"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE6zYWzEeaFx5FBVhZ7AQ" constrainedElement="_yQLBr4WzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE6zoWzEeaFx5FBVhZ7AQ" value="flavor MUST not repeat"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_yhG0zIaBEeaVYIZzHZR7BA" constrainedElement="_yhG6AIaBEeaVYIZzHZR7BA">
+      <specification xmi:type="uml:LiteralString" xmi:id="_yhG0zYaBEeaVYIZzHZR7BA" value="axis:CoordAxis[3]"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE6z4WzEeaFx5FBVhZ7AQ" constrainedElement="_yQMPm4WzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE60IWzEeaFx5FBVhZ7AQ" value="axis:CoordAxis[3]"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_yhG0zoaBEeaVYIZzHZR7BA" constrainedElement="_yhG6L4aBEeaVYIZzHZR7BA">
+      <specification xmi:type="uml:LiteralString" xmi:id="_yhG0z4aBEeaVYIZzHZR7BA" value="axis:CoordAxis[3]"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE60YWzEeaFx5FBVhZ7AQ" constrainedElement="_yQMPyoWzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE60oWzEeaFx5FBVhZ7AQ" value="axis:CoordAxis[2]"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_yhG00IaBEeaVYIZzHZR7BA" constrainedElement="_yhG6XoaBEeaVYIZzHZR7BA">
+      <specification xmi:type="uml:LiteralString" xmi:id="_yhG00YaBEeaVYIZzHZR7BA" value="axis:CoordAxis[2]"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE604WzEeaFx5FBVhZ7AQ" constrainedElement="_yQMP64WzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE61IWzEeaFx5FBVhZ7AQ" value="axis:CoordAxis[3]"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_yhG00oaBEeaVYIZzHZR7BA" constrainedElement="_yhG6f4aBEeaVYIZzHZR7BA">
+      <specification xmi:type="uml:LiteralString" xmi:id="_yhG004aBEeaVYIZzHZR7BA" value="axis:CoordAxis[2]"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE61YWzEeaFx5FBVhZ7AQ" constrainedElement="_yQM2r4WzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE61oWzEeaFx5FBVhZ7AQ" value="axis:CoordAxis[3]"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_yhG01IaBEeaVYIZzHZR7BA" constrainedElement="_yhG7VoaBEeaVYIZzHZR7BA">
+      <specification xmi:type="uml:LiteralString" xmi:id="_yhG01YaBEeaVYIZzHZR7BA" value="flavor MUST not repeat"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE614WzEeaFx5FBVhZ7AQ" constrainedElement="_yQM23oWzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE62IWzEeaFx5FBVhZ7AQ" value="axis:CoordAxis[2]"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_yhG01oaBEeaVYIZzHZR7BA" constrainedElement="_yhG7mYaBEeaVYIZzHZR7BA">
+      <specification xmi:type="uml:LiteralString" xmi:id="_yhG014aBEeaVYIZzHZR7BA" value="flavor MUST not repeat"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE62YWzEeaFx5FBVhZ7AQ" constrainedElement="_yQNdpoWzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE62oWzEeaFx5FBVhZ7AQ" value="axis:CoordAxis[2]"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_yhG02IaBEeaVYIZzHZR7BA" constrainedElement="_yhG8AIaBEeaVYIZzHZR7BA">
+      <specification xmi:type="uml:LiteralString" xmi:id="_yhG02YaBEeaVYIZzHZR7BA" value="flavor MUST not repeat"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE624WzEeaFx5FBVhZ7AQ" constrainedElement="_yQOr3oWzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE63IWzEeaFx5FBVhZ7AQ" value="elem:AssociatedQuantity[1]"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_yhG02oaBEeaVYIZzHZR7BA" constrainedElement="_yhG9sYaBEeaVYIZzHZR7BA">
+      <specification xmi:type="uml:LiteralString" xmi:id="_yhG024aBEeaVYIZzHZR7BA" value="flavor MUST not repeat"/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE63YWzEeaFx5FBVhZ7AQ" constrainedElement="_yQOr5IWzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE63oWzEeaFx5FBVhZ7AQ" value="elem:AssociatedQuantity[2]"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_yhG03IaBEeaVYIZzHZR7BA" constrainedElement="_yhQmyIaBEeaVYIZzHZR7BA">
+      <specification xmi:type="uml:LiteralString" xmi:id="_yhG03YaBEeaVYIZzHZR7BA" value="flavor MUST not repeat."/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE634WzEeaFx5FBVhZ7AQ" constrainedElement="_yQOr6oWzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE64IWzEeaFx5FBVhZ7AQ" value="elem:AssociatedQuantity[3]"/>
+    <ownedRule xmi:type="uml:Constraint" xmi:id="_yhG03oaBEeaVYIZzHZR7BA" constrainedElement="_yhQnlIaBEeaVYIZzHZR7BA">
+      <specification xmi:type="uml:LiteralString" xmi:id="_yhG034aBEeaVYIZzHZR7BA" value="flavor MUST not repeat."/>
     </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE64YWzEeaFx5FBVhZ7AQ" constrainedElement="_yQPS4IWzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE64oWzEeaFx5FBVhZ7AQ" value="flavor MUST not repeat"/>
-    </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE644WzEeaFx5FBVhZ7AQ" constrainedElement="_yQPTI4WzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE65IWzEeaFx5FBVhZ7AQ" value="flavor MUST not repeat"/>
-    </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE65YWzEeaFx5FBVhZ7AQ" constrainedElement="_yQP6JIWzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE65oWzEeaFx5FBVhZ7AQ" value="flavor MUST not repeat"/>
-    </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE654WzEeaFx5FBVhZ7AQ" constrainedElement="_yQRvIoWzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE66IWzEeaFx5FBVhZ7AQ" value="flavor MUST not repeat"/>
-    </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE66YWzEeaFx5FBVhZ7AQ" constrainedElement="_yQSWTYWzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE66oWzEeaFx5FBVhZ7AQ" value="axis:CoordAxis[1]"/>
-    </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE664WzEeaFx5FBVhZ7AQ" constrainedElement="_yQS9joWzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE67IWzEeaFx5FBVhZ7AQ" value="flavor MUST not repeat."/>
-    </ownedRule>
-    <ownedRule xmi:type="uml:Constraint" xmi:id="_yQE67YWzEeaFx5FBVhZ7AQ" constrainedElement="_yQUyu4WzEeaFx5FBVhZ7AQ">
-      <specification xmi:type="uml:LiteralString" xmi:id="_yQE67oWzEeaFx5FBVhZ7AQ" value="flavor MUST not repeat."/>
-    </ownedRule>
-    <packagedElement xmi:type="uml:Package" xmi:id="_yQE674WzEeaFx5FBVhZ7AQ" name="ivoa">
-      <eAnnotations xmi:id="_yQE68IWzEeaFx5FBVhZ7AQ" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_yQE68YWzEeaFx5FBVhZ7AQ" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQE68oWzEeaFx5FBVhZ7AQ" value="0"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_yhG04IaBEeaVYIZzHZR7BA" name="ivoa">
+      <eAnnotations xmi:id="_yhG04YaBEeaVYIZzHZR7BA" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_yhG04oaBEeaVYIZzHZR7BA" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG044aBEeaVYIZzHZR7BA" value="0"/>
         </contents>
       </eAnnotations>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQFh0IWzEeaFx5FBVhZ7AQ" name="nonnegativeInteger">
-        <eAnnotations xmi:id="_yQFh0YWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQFh0oWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFh04WzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yhG05IaBEeaVYIZzHZR7BA" name="nonnegativeInteger">
+        <eAnnotations xmi:id="_yhG05YaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG05oaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG054aBEeaVYIZzHZR7BA" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_yQFh1IWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yhG06IaBEeaVYIZzHZR7BA" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQFh1YWzEeaFx5FBVhZ7AQ" name="integer">
-        <eAnnotations xmi:id="_yQFh1oWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQFh14WzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFh2IWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yhG06YaBEeaVYIZzHZR7BA" name="integer">
+        <eAnnotations xmi:id="_yhG06oaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG064aBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG07IaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_yQFh2YWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yhG07YaBEeaVYIZzHZR7BA" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQFh2oWzEeaFx5FBVhZ7AQ" name="rational">
-        <eAnnotations xmi:id="_yQFh24WzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQFh3IWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFh3YWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yhG07oaBEeaVYIZzHZR7BA" name="rational">
+        <eAnnotations xmi:id="_yhG074aBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG08IaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG08YaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_yQFh3oWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yhG08oaBEeaVYIZzHZR7BA" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQFh34WzEeaFx5FBVhZ7AQ" name="real">
-        <eAnnotations xmi:id="_yQFh4IWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQFh4YWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFh4oWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yhG084aBEeaVYIZzHZR7BA" name="real">
+        <eAnnotations xmi:id="_yhG09IaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG09YaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG09oaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_yQFh44WzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yhG094aBEeaVYIZzHZR7BA" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQFh5IWzEeaFx5FBVhZ7AQ" name="complex">
-        <eAnnotations xmi:id="_yQFh5YWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQFh5oWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFh54WzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yhG0-IaBEeaVYIZzHZR7BA" name="complex">
+        <eAnnotations xmi:id="_yhG0-YaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG0-oaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG0-4aBEeaVYIZzHZR7BA" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_yQFh6IWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yhG0_IaBEeaVYIZzHZR7BA" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQFh6YWzEeaFx5FBVhZ7AQ" name="string">
-        <eAnnotations xmi:id="_yQFh6oWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQFh64WzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFh7IWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yhG0_YaBEeaVYIZzHZR7BA" name="string">
+        <eAnnotations xmi:id="_yhG0_oaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG0_4aBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1AIaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_yQFh7YWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yhG1AYaBEeaVYIZzHZR7BA" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQFh7oWzEeaFx5FBVhZ7AQ" name="boolean">
-        <eAnnotations xmi:id="_yQFh74WzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQFh8IWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFh8YWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yhG1AoaBEeaVYIZzHZR7BA" name="boolean">
+        <eAnnotations xmi:id="_yhG1A4aBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG1BIaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1BYaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_yQFh8oWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yhG1BoaBEeaVYIZzHZR7BA" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQFh84WzEeaFx5FBVhZ7AQ" name="datetime">
-        <eAnnotations xmi:id="_yQFh9IWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQFh9YWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFh9oWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yhG1B4aBEeaVYIZzHZR7BA" name="datetime">
+        <eAnnotations xmi:id="_yhG1CIaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG1CYaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1CoaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_yQFh94WzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yhG1C4aBEeaVYIZzHZR7BA" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQFh-IWzEeaFx5FBVhZ7AQ" name="anyURI">
-        <eAnnotations xmi:id="_yQFh-YWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQFh-oWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFh-4WzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yhG1DIaBEeaVYIZzHZR7BA" name="anyURI">
+        <eAnnotations xmi:id="_yhG1DYaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG1DoaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1D4aBEeaVYIZzHZR7BA" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_yQFh_IWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yhG1EIaBEeaVYIZzHZR7BA" name="isPrimitive"/>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQFh_YWzEeaFx5FBVhZ7AQ" general="_yQFh6YWzEeaFx5FBVhZ7AQ"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG1EYaBEeaVYIZzHZR7BA" general="_yhG0_YaBEeaVYIZzHZR7BA"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQFh_oWzEeaFx5FBVhZ7AQ" name="Quantity" isAbstract="true">
-        <eAnnotations xmi:id="_yQFh_4WzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQFiAIWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFiAYWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yhG1EoaBEeaVYIZzHZR7BA" name="Quantity" isAbstract="true">
+        <eAnnotations xmi:id="_yhG1E4aBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG1FIaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1FYaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_yQFiAoWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yhG1FoaBEeaVYIZzHZR7BA" name="isPrimitive"/>
         </eAnnotations>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQFiA4WzEeaFx5FBVhZ7AQ" name="unit" visibility="public" type="_yQFiIoWzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQFiBIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQFiBYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFiBoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1F4aBEeaVYIZzHZR7BA" name="unit" visibility="public" type="_yhG1NoaBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1GIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1GYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1GoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQFiB4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFiCIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1G4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1HIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQFiCYWzEeaFx5FBVhZ7AQ"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG1HYaBEeaVYIZzHZR7BA"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQFiCoWzEeaFx5FBVhZ7AQ" name="IntegerQuantity">
-        <eAnnotations xmi:id="_yQFiC4WzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQFiDIWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFiDYWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yhG1HoaBEeaVYIZzHZR7BA" name="IntegerQuantity">
+        <eAnnotations xmi:id="_yhG1H4aBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG1IIaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1IYaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_yQFiDoWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yhG1IoaBEeaVYIZzHZR7BA" name="isPrimitive"/>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQFiD4WzEeaFx5FBVhZ7AQ" general="_yQFh_oWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQFiEIWzEeaFx5FBVhZ7AQ" name="value" visibility="public" type="_yQFh1YWzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQFiEYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQFiEoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFiE4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG1I4aBEeaVYIZzHZR7BA" general="_yhG1EoaBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1JIaBEeaVYIZzHZR7BA" name="value" visibility="public" type="_yhG06YaBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1JYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1JoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1J4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQFiFIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFiFYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1KIaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1KYaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQFiFoWzEeaFx5FBVhZ7AQ" name="RealQuantity">
-        <eAnnotations xmi:id="_yQFiF4WzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQFiGIWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFiGYWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yhG1KoaBEeaVYIZzHZR7BA" name="RealQuantity">
+        <eAnnotations xmi:id="_yhG1K4aBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG1LIaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1LYaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_yQFiGoWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yhG1LoaBEeaVYIZzHZR7BA" name="isPrimitive"/>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQFiG4WzEeaFx5FBVhZ7AQ" general="_yQFh_oWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQFiHIWzEeaFx5FBVhZ7AQ" name="value" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQFiHYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQFiHoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFiH4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG1L4aBEeaVYIZzHZR7BA" general="_yhG1EoaBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1MIaBEeaVYIZzHZR7BA" name="value" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1MYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1MoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1M4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQFiIIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFiIYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1NIaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1NYaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQFiIoWzEeaFx5FBVhZ7AQ" name="Unit">
-        <eAnnotations xmi:id="_yQFiI4WzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQFiJIWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFiJYWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yhG1NoaBEeaVYIZzHZR7BA" name="Unit">
+        <eAnnotations xmi:id="_yhG1N4aBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG1OIaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1OYaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_yQFiJoWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yhG1OoaBEeaVYIZzHZR7BA" name="isPrimitive"/>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQFiJ4WzEeaFx5FBVhZ7AQ" general="_yQFh6YWzEeaFx5FBVhZ7AQ"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG1O4aBEeaVYIZzHZR7BA" general="_yhG0_YaBEeaVYIZzHZR7BA"/>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:InformationItem" xmi:id="_yQFiKIWzEeaFx5FBVhZ7AQ" name="STC-2.0 Prototype">
-      <eAnnotations xmi:id="_yQFiKYWzEeaFx5FBVhZ7AQ" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_yQFiKoWzEeaFx5FBVhZ7AQ" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFiK4WzEeaFx5FBVhZ7AQ" value="0"/>
+    <packagedElement xmi:type="uml:InformationItem" xmi:id="_yhG1PIaBEeaVYIZzHZR7BA" name="STC-2.0 Prototype">
+      <eAnnotations xmi:id="_yhG1PYaBEeaVYIZzHZR7BA" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_yhG1PoaBEeaVYIZzHZR7BA" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1P4aBEeaVYIZzHZR7BA" value="0"/>
         </contents>
       </eAnnotations>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_yQFiLIWzEeaFx5FBVhZ7AQ" name="stctypes">
-      <eAnnotations xmi:id="_yQFiLYWzEeaFx5FBVhZ7AQ" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_yQFiLoWzEeaFx5FBVhZ7AQ" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFiL4WzEeaFx5FBVhZ7AQ" value="0"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_yhG1QIaBEeaVYIZzHZR7BA" name="stctypes">
+      <eAnnotations xmi:id="_yhG1QYaBEeaVYIZzHZR7BA" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_yhG1QoaBEeaVYIZzHZR7BA" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1Q4aBEeaVYIZzHZR7BA" value="0"/>
         </contents>
       </eAnnotations>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_yQFiMIWzEeaFx5FBVhZ7AQ" name="Handedness">
-        <eAnnotations xmi:id="_yQFiMYWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQFiMoWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQFiM4WzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_yhG1RIaBEeaVYIZzHZR7BA" name="Handedness">
+        <eAnnotations xmi:id="_yhG1RYaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG1RoaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1R4aBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQFiNIWzEeaFx5FBVhZ7AQ" name="left"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQFiNYWzEeaFx5FBVhZ7AQ" name="right"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG1SIaBEeaVYIZzHZR7BA" name="left"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG1SYaBEeaVYIZzHZR7BA" name="right"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQFiNoWzEeaFx5FBVhZ7AQ" name="Matrix" isAbstract="true">
-        <eAnnotations xmi:id="_yQFiN4WzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQGI4IWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGI4YWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yhG1SoaBEeaVYIZzHZR7BA" name="Matrix" isAbstract="true">
+        <eAnnotations xmi:id="_yhG1S4aBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG1TIaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1TYaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_yQGI4oWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yhG1ToaBEeaVYIZzHZR7BA" name="isPrimitive"/>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQGI44WzEeaFx5FBVhZ7AQ" name="Matrix2x2">
-        <eAnnotations xmi:id="_yQGI5IWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQGI5YWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGI5oWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yhG1T4aBEeaVYIZzHZR7BA" name="Matrix2x2">
+        <eAnnotations xmi:id="_yhG1UIaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG1UYaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1UoaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_yQGI54WzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yhG1U4aBEeaVYIZzHZR7BA" name="isPrimitive"/>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQGI6IWzEeaFx5FBVhZ7AQ" general="_yQFiNoWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGI6YWzEeaFx5FBVhZ7AQ" name="m11" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGI6oWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGI64WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGI7IWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG1VIaBEeaVYIZzHZR7BA" general="_yhG1SoaBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1VYaBEeaVYIZzHZR7BA" name="m11" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1VoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1V4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1WIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGI7YWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGI7oWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1WYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1WoaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGI74WzEeaFx5FBVhZ7AQ" name="m12" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGI8IWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGI8YWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGI8oWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1W4aBEeaVYIZzHZR7BA" name="m12" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1XIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1XYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1XoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGI84WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGI9IWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1X4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1YIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGI9YWzEeaFx5FBVhZ7AQ" name="m21" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGI9oWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGI94WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGI-IWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1YYaBEeaVYIZzHZR7BA" name="m21" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1YoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1Y4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1ZIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGI-YWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGI-oWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1ZYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1ZoaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGI-4WzEeaFx5FBVhZ7AQ" name="m22" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGI_IWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGI_YWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGI_oWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1Z4aBEeaVYIZzHZR7BA" name="m22" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1aIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1aYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1aoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGI_4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJAIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1a4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1bIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQGJAYWzEeaFx5FBVhZ7AQ" name="Matrix3x3">
-        <eAnnotations xmi:id="_yQGJAoWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQGJA4WzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJBIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yhG1bYaBEeaVYIZzHZR7BA" name="Matrix3x3">
+        <eAnnotations xmi:id="_yhG1boaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG1b4aBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1cIaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
-          <contents xmi:type="uml:Property" xmi:id="_yQGJBYWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
+          <contents xmi:type="uml:Property" xmi:id="_yhG1cYaBEeaVYIZzHZR7BA" name="isPrimitive"/>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQGJBoWzEeaFx5FBVhZ7AQ" general="_yQFiNoWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGJB4WzEeaFx5FBVhZ7AQ" name="m11" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGJCIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGJCYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJCoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG1coaBEeaVYIZzHZR7BA" general="_yhG1SoaBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1c4aBEeaVYIZzHZR7BA" name="m11" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1dIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1dYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1doaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGJC4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJDIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1d4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1eIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGJDYWzEeaFx5FBVhZ7AQ" name="m12" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGJDoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGJD4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJEIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1eYaBEeaVYIZzHZR7BA" name="m12" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1eoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1e4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1fIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGJEYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJEoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1fYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1foaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGJE4WzEeaFx5FBVhZ7AQ" name="m13" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGJFIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGJFYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJFoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1f4aBEeaVYIZzHZR7BA" name="m13" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1gIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1gYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1goaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGJF4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJGIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1g4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1hIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGJGYWzEeaFx5FBVhZ7AQ" name="m21" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGJGoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGJG4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJHIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1hYaBEeaVYIZzHZR7BA" name="m21" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1hoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1h4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1iIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGJHYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJHoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1iYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1ioaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGJH4WzEeaFx5FBVhZ7AQ" name="m22" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGJIIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGJIYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJIoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1i4aBEeaVYIZzHZR7BA" name="m22" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1jIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1jYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1joaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGJI4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJJIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1j4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1kIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGJJYWzEeaFx5FBVhZ7AQ" name="m23" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGJJoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGJJ4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJKIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1kYaBEeaVYIZzHZR7BA" name="m23" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1koaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1k4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1lIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGJKYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJKoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1lYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1loaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGJK4WzEeaFx5FBVhZ7AQ" name="m31" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGJLIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGJLYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJLoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1l4aBEeaVYIZzHZR7BA" name="m31" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1mIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1mYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1moaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGJL4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJMIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1m4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1nIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGJMYWzEeaFx5FBVhZ7AQ" name="m32" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGJMoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGJM4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJNIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1nYaBEeaVYIZzHZR7BA" name="m32" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1noaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1n4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1oIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGJNYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJNoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1oYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1ooaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGJN4WzEeaFx5FBVhZ7AQ" name="m33" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGJOIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGJOYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJOoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1o4aBEeaVYIZzHZR7BA" name="m33" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1pIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1pYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1poaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGJO4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJPIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1p4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1qIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_yQGJPYWzEeaFx5FBVhZ7AQ" name="frametransforms">
-      <eAnnotations xmi:id="_yQGJPoWzEeaFx5FBVhZ7AQ" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_yQGJP4WzEeaFx5FBVhZ7AQ" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJQIWzEeaFx5FBVhZ7AQ" value="0"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_yhG1qYaBEeaVYIZzHZR7BA" name="frametransforms">
+      <eAnnotations xmi:id="_yhG1qoaBEeaVYIZzHZR7BA" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_yhG1q4aBEeaVYIZzHZR7BA" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1rIaBEeaVYIZzHZR7BA" value="0"/>
         </contents>
       </eAnnotations>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQGJQYWzEeaFx5FBVhZ7AQ" name="TPolarization">
-        <eAnnotations xmi:id="_yQGJQoWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQGJQ4WzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJRIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG1rYaBEeaVYIZzHZR7BA" name="TPolarization">
+        <eAnnotations xmi:id="_yhG1roaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG1r4aBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1sIaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQGJRYWzEeaFx5FBVhZ7AQ" general="_yQHXVIWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGJRoWzEeaFx5FBVhZ7AQ" name="entry" visibility="public" type="_yQH-SYWzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQGv8YWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQGJR4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGJSIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJSYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG1sYaBEeaVYIZzHZR7BA" general="_yhG2f4aBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1soaBEeaVYIZzHZR7BA" name="entry" visibility="public" type="_yhG2x4aBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG1uYaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG1s4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1tIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1tYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGJSoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGJS4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1toaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1t4aBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQGv8IWzEeaFx5FBVhZ7AQ" value="*"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG1uIaBEeaVYIZzHZR7BA" value="*"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_yQGv8YWzEeaFx5FBVhZ7AQ" memberEnd="_yQGJRoWzEeaFx5FBVhZ7AQ _yQGv8oWzEeaFx5FBVhZ7AQ">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_yQGv8oWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQGJQYWzEeaFx5FBVhZ7AQ" association="_yQGv8YWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQGv84WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGv9IWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGv9YWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yhG1uYaBEeaVYIZzHZR7BA" memberEnd="_yhG1soaBEeaVYIZzHZR7BA _yhG1uoaBEeaVYIZzHZR7BA">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yhG1uoaBEeaVYIZzHZR7BA" visibility="public" type="_yhG1rYaBEeaVYIZzHZR7BA" association="_yhG1uYaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG1u4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1vIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1vYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGv9oWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGv94WzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1voaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1v4aBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQGv-IWzEeaFx5FBVhZ7AQ" name="TPolStokes">
-        <eAnnotations xmi:id="_yQGv-YWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQGv-oWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGv-4WzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG1wIaBEeaVYIZzHZR7BA" name="TPolStokes">
+        <eAnnotations xmi:id="_yhG1wYaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG1woaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1w4aBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQGv_IWzEeaFx5FBVhZ7AQ" general="_yQH-SYWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGv_YWzEeaFx5FBVhZ7AQ" name="nativeValue" visibility="public" type="_yQFh1YWzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGv_oWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGv_4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwAIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG1xIaBEeaVYIZzHZR7BA" general="_yhG2x4aBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1xYaBEeaVYIZzHZR7BA" name="nativeValue" visibility="public" type="_yhG06YaBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1xoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1x4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1yIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGwAYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwAoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1yYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1yoaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGwA4WzEeaFx5FBVhZ7AQ" name="polType" visibility="public" type="_yQYdEoWzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGwBIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGwBYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwBoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1y4aBEeaVYIZzHZR7BA" name="polType" visibility="public" type="_yhQpF4aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1zIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1zYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1zoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGwB4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwCIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1z4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG10IaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQGwCYWzEeaFx5FBVhZ7AQ" name="TPolLinear">
-        <eAnnotations xmi:id="_yQGwCoWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQGwC4WzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwDIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG10YaBEeaVYIZzHZR7BA" name="TPolLinear">
+        <eAnnotations xmi:id="_yhG10oaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG104aBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG11IaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQGwDYWzEeaFx5FBVhZ7AQ" general="_yQH-SYWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGwDoWzEeaFx5FBVhZ7AQ" name="nativeValue" visibility="public" type="_yQFh1YWzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGwD4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGwEIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwEYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG11YaBEeaVYIZzHZR7BA" general="_yhG2x4aBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG11oaBEeaVYIZzHZR7BA" name="nativeValue" visibility="public" type="_yhG06YaBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG114aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG12IaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG12YaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGwEoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwE4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG12oaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG124aBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGwFIWzEeaFx5FBVhZ7AQ" name="polType" visibility="public" type="_yQZD2IWzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGwFYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGwFoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwF4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG13IaBEeaVYIZzHZR7BA" name="polType" visibility="public" type="_yhQpJ4aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG13YaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG13oaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG134aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGwGIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwGYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG14IaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG14YaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQGwGoWzEeaFx5FBVhZ7AQ" name="TPolCircular">
-        <eAnnotations xmi:id="_yQGwG4WzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQGwHIWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwHYWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG14oaBEeaVYIZzHZR7BA" name="TPolCircular">
+        <eAnnotations xmi:id="_yhG144aBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG15IaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG15YaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQGwHoWzEeaFx5FBVhZ7AQ" general="_yQH-SYWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGwH4WzEeaFx5FBVhZ7AQ" name="nativeValue" visibility="public" type="_yQFh1YWzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGwIIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGwIYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwIoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG15oaBEeaVYIZzHZR7BA" general="_yhG2x4aBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG154aBEeaVYIZzHZR7BA" name="nativeValue" visibility="public" type="_yhG06YaBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG16IaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG16YaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG16oaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGwI4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwJIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG164aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG17IaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGwJYWzEeaFx5FBVhZ7AQ" name="polType" visibility="public" type="_yQZD0IWzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGwJoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGwJ4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwKIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG17YaBEeaVYIZzHZR7BA" name="polType" visibility="public" type="_yhQpH4aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG17oaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG174aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG18IaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGwKYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwKoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG18YaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG18oaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQGwK4WzEeaFx5FBVhZ7AQ" name="TPolVector">
-        <eAnnotations xmi:id="_yQGwLIWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQGwLYWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwLoWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG184aBEeaVYIZzHZR7BA" name="TPolVector">
+        <eAnnotations xmi:id="_yhG19IaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG19YaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG19oaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQGwL4WzEeaFx5FBVhZ7AQ" general="_yQH-SYWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGwMIWzEeaFx5FBVhZ7AQ" name="nativeValue" visibility="public" type="_yQFh1YWzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGwMYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGwMoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwM4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG194aBEeaVYIZzHZR7BA" general="_yhG2x4aBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1-IaBEeaVYIZzHZR7BA" name="nativeValue" visibility="public" type="_yhG06YaBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1-YaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG1-oaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1-4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGwNIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwNYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG1_IaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG1_YaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGwNoWzEeaFx5FBVhZ7AQ" name="polType" visibility="public" type="_yQZD4IWzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGwN4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGwOIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwOYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG1_oaBEeaVYIZzHZR7BA" name="polType" visibility="public" type="_yhQpL4aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG1_4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2AIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2AYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGwOoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwO4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2AoaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2A4aBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQGwPIWzEeaFx5FBVhZ7AQ" name="TUnit">
-        <eAnnotations xmi:id="_yQGwPYWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQGwPoWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwP4WzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG2BIaBEeaVYIZzHZR7BA" name="TUnit">
+        <eAnnotations xmi:id="_yhG2BYaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG2BoaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2B4aBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQGwQIWzEeaFx5FBVhZ7AQ" general="_yQH-XYWzEeaFx5FBVhZ7AQ"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG2CIaBEeaVYIZzHZR7BA" general="_yhG224aBEeaVYIZzHZR7BA"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQGwQYWzEeaFx5FBVhZ7AQ" name="TShift1D">
-        <eAnnotations xmi:id="_yQGwQoWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQGwQ4WzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwRIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG2CYaBEeaVYIZzHZR7BA" name="TShift1D">
+        <eAnnotations xmi:id="_yhG2CoaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG2C4aBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2DIaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQGwRYWzEeaFx5FBVhZ7AQ" general="_yQH-XYWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGwRoWzEeaFx5FBVhZ7AQ" name="shift" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGwR4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGwSIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwSYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG2DYaBEeaVYIZzHZR7BA" general="_yhG224aBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2DoaBEeaVYIZzHZR7BA" name="shift" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2D4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2EIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2EYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGwSoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwS4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2EoaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2E4aBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQGwTIWzEeaFx5FBVhZ7AQ" name="TShift2D">
-        <eAnnotations xmi:id="_yQGwTYWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQGwToWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwT4WzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG2FIaBEeaVYIZzHZR7BA" name="TShift2D">
+        <eAnnotations xmi:id="_yhG2FYaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG2FoaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2F4aBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQGwUIWzEeaFx5FBVhZ7AQ" general="_yQH-XYWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGwUYWzEeaFx5FBVhZ7AQ" name="shift" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGwUoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGwU4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwVIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG2GIaBEeaVYIZzHZR7BA" general="_yhG224aBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2GYaBEeaVYIZzHZR7BA" name="shift" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2GoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2G4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2HIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGwVYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwVoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2HYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2HoaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQGwV4WzEeaFx5FBVhZ7AQ" value="2"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQGwWIWzEeaFx5FBVhZ7AQ" value="2"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG2H4aBEeaVYIZzHZR7BA" value="2"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG2IIaBEeaVYIZzHZR7BA" value="2"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQGwWYWzEeaFx5FBVhZ7AQ" name="TScale1D">
-        <eAnnotations xmi:id="_yQGwWoWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQGwW4WzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwXIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG2IYaBEeaVYIZzHZR7BA" name="TScale1D">
+        <eAnnotations xmi:id="_yhG2IoaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG2I4aBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2JIaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQGwXYWzEeaFx5FBVhZ7AQ" general="_yQH-XYWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQGwXoWzEeaFx5FBVhZ7AQ" name="factor" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQGwX4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQGwYIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQGwYYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG2JYaBEeaVYIZzHZR7BA" general="_yhG224aBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2JoaBEeaVYIZzHZR7BA" name="factor" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2J4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2KIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2KYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQGwYoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXAIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2KoaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2K4aBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQHXAYWzEeaFx5FBVhZ7AQ" name="TScale2D">
-        <eAnnotations xmi:id="_yQHXAoWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQHXA4WzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXBIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG2LIaBEeaVYIZzHZR7BA" name="TScale2D">
+        <eAnnotations xmi:id="_yhG2LYaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG2LoaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2L4aBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQHXBYWzEeaFx5FBVhZ7AQ" general="_yQH-XYWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQHXBoWzEeaFx5FBVhZ7AQ" name="factor" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQHXB4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQHXCIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXCYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG2MIaBEeaVYIZzHZR7BA" general="_yhG224aBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2MYaBEeaVYIZzHZR7BA" name="factor" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2MoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2M4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2NIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQHXCoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXC4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2NYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2NoaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQHXDIWzEeaFx5FBVhZ7AQ" value="2"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQHXDYWzEeaFx5FBVhZ7AQ" value="2"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG2N4aBEeaVYIZzHZR7BA" value="2"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG2OIaBEeaVYIZzHZR7BA" value="2"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQHXDoWzEeaFx5FBVhZ7AQ" name="TRotate2D">
-        <eAnnotations xmi:id="_yQHXD4WzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQHXEIWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXEYWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG2OYaBEeaVYIZzHZR7BA" name="TRotate2D">
+        <eAnnotations xmi:id="_yhG2OoaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG2O4aBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2PIaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQHXEoWzEeaFx5FBVhZ7AQ" general="_yQH-XYWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQHXE4WzEeaFx5FBVhZ7AQ" name="angle" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQHXFIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQHXFYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXFoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG2PYaBEeaVYIZzHZR7BA" general="_yhG224aBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2PoaBEeaVYIZzHZR7BA" name="angle" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2P4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2QIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2QYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQHXF4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXGIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2QoaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2Q4aBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQHXGYWzEeaFx5FBVhZ7AQ" name="TMatrix">
-        <eAnnotations xmi:id="_yQHXGoWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQHXG4WzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXHIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG2RIaBEeaVYIZzHZR7BA" name="TMatrix">
+        <eAnnotations xmi:id="_yhG2RYaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG2RoaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2R4aBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQHXHYWzEeaFx5FBVhZ7AQ" general="_yQH-XYWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQHXHoWzEeaFx5FBVhZ7AQ" name="matrix" visibility="public" type="_yQFiNoWzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQHXH4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQHXIIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXIYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG2SIaBEeaVYIZzHZR7BA" general="_yhG224aBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2SYaBEeaVYIZzHZR7BA" name="matrix" visibility="public" type="_yhG1SoaBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2SoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2S4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2TIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQHXIoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXI4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2TYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2ToaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQHXJIWzEeaFx5FBVhZ7AQ" name="TPolynomial">
-        <eAnnotations xmi:id="_yQHXJYWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQHXJoWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXJ4WzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG2T4aBEeaVYIZzHZR7BA" name="TPolynomial">
+        <eAnnotations xmi:id="_yhG2UIaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG2UYaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2UoaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQHXKIWzEeaFx5FBVhZ7AQ" general="_yQH-XYWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQHXKYWzEeaFx5FBVhZ7AQ" name="term" visibility="public" type="_yQH-TYWzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQHXNoWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQHXKoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQHXK4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXLIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG2U4aBEeaVYIZzHZR7BA" general="_yhG224aBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2VIaBEeaVYIZzHZR7BA" name="term" visibility="public" type="_yhG2y4aBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG2YYaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG2VYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2VoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2V4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQHXLYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXLoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2WIaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2WYaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQHXL4WzEeaFx5FBVhZ7AQ" value="*"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG2WoaBEeaVYIZzHZR7BA" value="*"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQHXMIWzEeaFx5FBVhZ7AQ" name="order" visibility="public" type="_yQFh0IWzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQHXMYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQHXMoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXM4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2W4aBEeaVYIZzHZR7BA" name="order" visibility="public" type="_yhG05IaBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2XIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2XYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2XoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQHXNIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXNYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2X4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2YIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_yQHXNoWzEeaFx5FBVhZ7AQ" memberEnd="_yQHXKYWzEeaFx5FBVhZ7AQ _yQHXN4WzEeaFx5FBVhZ7AQ">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_yQHXN4WzEeaFx5FBVhZ7AQ" visibility="public" type="_yQHXJIWzEeaFx5FBVhZ7AQ" association="_yQHXNoWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQHXOIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQHXOYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXOoWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yhG2YYaBEeaVYIZzHZR7BA" memberEnd="_yhG2VIaBEeaVYIZzHZR7BA _yhG2YoaBEeaVYIZzHZR7BA">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yhG2YoaBEeaVYIZzHZR7BA" visibility="public" type="_yhG2T4aBEeaVYIZzHZR7BA" association="_yhG2YYaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG2Y4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2ZIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2ZYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQHXO4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXPIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2ZoaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2Z4aBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQHXPYWzEeaFx5FBVhZ7AQ" name="TProjection1D">
-        <eAnnotations xmi:id="_yQHXPoWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQHXP4WzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXQIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG2aIaBEeaVYIZzHZR7BA" name="TProjection1D">
+        <eAnnotations xmi:id="_yhG2aYaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG2aoaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2a4aBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQHXQYWzEeaFx5FBVhZ7AQ" general="_yQH-XYWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQHXQoWzEeaFx5FBVhZ7AQ" name="algorithm" visibility="public" type="_yQIlT4WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQHXQ4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQHXRIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXRYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG2bIaBEeaVYIZzHZR7BA" general="_yhG224aBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2bYaBEeaVYIZzHZR7BA" name="algorithm" visibility="public" type="_yhG3JYaBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2boaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2b4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2cIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQHXRoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXR4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2cYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2coaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQHXSIWzEeaFx5FBVhZ7AQ" name="nativeRefValue" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQHXSYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQHXSoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXS4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2c4aBEeaVYIZzHZR7BA" name="nativeRefValue" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2dIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2dYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2doaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQHXTIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXTYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2d4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2eIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQHXToWzEeaFx5FBVhZ7AQ" name="targetRefValue" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQHXT4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQHXUIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXUYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2eYaBEeaVYIZzHZR7BA" name="targetRefValue" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2eoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2e4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2fIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQHXUoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXU4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2fYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2foaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQHXVIWzEeaFx5FBVhZ7AQ" name="TLookup" isAbstract="true">
-        <eAnnotations xmi:id="_yQHXVYWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQHXVoWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXV4WzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG2f4aBEeaVYIZzHZR7BA" name="TLookup" isAbstract="true">
+        <eAnnotations xmi:id="_yhG2gIaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG2gYaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2goaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQHXWIWzEeaFx5FBVhZ7AQ" general="_yQH-XYWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQHXWYWzEeaFx5FBVhZ7AQ" name="nvals" visibility="public" type="_yQFh0IWzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQHXWoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQHXW4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXXIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG2g4aBEeaVYIZzHZR7BA" general="_yhG224aBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2hIaBEeaVYIZzHZR7BA" name="nvals" visibility="public" type="_yhG05IaBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2hYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2hoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2h4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQHXXYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXXoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2iIaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2iYaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQHXX4WzEeaFx5FBVhZ7AQ" name="TLookupMap">
-        <eAnnotations xmi:id="_yQHXYIWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQHXYYWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQHXYoWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG2ioaBEeaVYIZzHZR7BA" name="TLookupMap">
+        <eAnnotations xmi:id="_yhG2i4aBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG2jIaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2jYaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQH-EIWzEeaFx5FBVhZ7AQ" general="_yQHXVIWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQH-EYWzEeaFx5FBVhZ7AQ" name="entry" visibility="public" type="_yQH-H4WzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQH-GIWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQH-EoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQH-E4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-FIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG2joaBEeaVYIZzHZR7BA" general="_yhG2f4aBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2j4aBEeaVYIZzHZR7BA" name="entry" visibility="public" type="_yhG2nYaBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG2loaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG2kIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2kYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2koaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQH-FYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-FoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2k4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2lIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQH-F4WzEeaFx5FBVhZ7AQ" value="*"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG2lYaBEeaVYIZzHZR7BA" value="*"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_yQH-GIWzEeaFx5FBVhZ7AQ" memberEnd="_yQH-EYWzEeaFx5FBVhZ7AQ _yQH-GYWzEeaFx5FBVhZ7AQ">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_yQH-GYWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQHXX4WzEeaFx5FBVhZ7AQ" association="_yQH-GIWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQH-GoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQH-G4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-HIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yhG2loaBEeaVYIZzHZR7BA" memberEnd="_yhG2j4aBEeaVYIZzHZR7BA _yhG2l4aBEeaVYIZzHZR7BA">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yhG2l4aBEeaVYIZzHZR7BA" visibility="public" type="_yhG2ioaBEeaVYIZzHZR7BA" association="_yhG2loaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG2mIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2mYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2moaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQH-HYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-HoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2m4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2nIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQH-H4WzEeaFx5FBVhZ7AQ" name="TLookupEntry" isAbstract="true">
-        <eAnnotations xmi:id="_yQH-IIWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQH-IYWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-IoWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG2nYaBEeaVYIZzHZR7BA" name="TLookupEntry" isAbstract="true">
+        <eAnnotations xmi:id="_yhG2noaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG2n4aBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2oIaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQH-I4WzEeaFx5FBVhZ7AQ" name="TLookupEntry1D">
-        <eAnnotations xmi:id="_yQH-JIWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQH-JYWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-JoWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG2oYaBEeaVYIZzHZR7BA" name="TLookupEntry1D">
+        <eAnnotations xmi:id="_yhG2ooaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG2o4aBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2pIaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQH-J4WzEeaFx5FBVhZ7AQ" general="_yQH-H4WzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQH-KIWzEeaFx5FBVhZ7AQ" name="nativeValue" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQH-KYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQH-KoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-K4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG2pYaBEeaVYIZzHZR7BA" general="_yhG2nYaBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2poaBEeaVYIZzHZR7BA" name="nativeValue" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2p4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2qIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2qYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQH-LIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-LYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2qoaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2q4aBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQH-LoWzEeaFx5FBVhZ7AQ" name="targetValue" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQH-L4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQH-MIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-MYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2rIaBEeaVYIZzHZR7BA" name="targetValue" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2rYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2roaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2r4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQH-MoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-M4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2sIaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2sYaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQH-NIWzEeaFx5FBVhZ7AQ" name="TLookupEntry2D">
-        <eAnnotations xmi:id="_yQH-NYWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQH-NoWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-N4WzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG2soaBEeaVYIZzHZR7BA" name="TLookupEntry2D">
+        <eAnnotations xmi:id="_yhG2s4aBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG2tIaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2tYaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQH-OIWzEeaFx5FBVhZ7AQ" general="_yQH-H4WzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQH-OYWzEeaFx5FBVhZ7AQ" name="nativeValue" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQH-OoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQH-O4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-PIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG2toaBEeaVYIZzHZR7BA" general="_yhG2nYaBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2t4aBEeaVYIZzHZR7BA" name="nativeValue" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2uIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2uYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2uoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQH-PYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-PoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2u4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2vIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQH-P4WzEeaFx5FBVhZ7AQ" value="2"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQH-QIWzEeaFx5FBVhZ7AQ" value="2"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG2vYaBEeaVYIZzHZR7BA" value="2"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG2voaBEeaVYIZzHZR7BA" value="2"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQH-QYWzEeaFx5FBVhZ7AQ" name="targetValue" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQH-QoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQH-Q4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-RIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2v4aBEeaVYIZzHZR7BA" name="targetValue" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2wIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2wYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2woaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQH-RYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-RoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2w4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2xIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQH-R4WzEeaFx5FBVhZ7AQ" value="2"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQH-SIWzEeaFx5FBVhZ7AQ" value="2"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG2xYaBEeaVYIZzHZR7BA" value="2"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG2xoaBEeaVYIZzHZR7BA" value="2"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQH-SYWzEeaFx5FBVhZ7AQ" name="TPolarizationEntry" isAbstract="true">
-        <eAnnotations xmi:id="_yQH-SoWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQH-S4WzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-TIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG2x4aBEeaVYIZzHZR7BA" name="TPolarizationEntry" isAbstract="true">
+        <eAnnotations xmi:id="_yhG2yIaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG2yYaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2yoaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQH-TYWzEeaFx5FBVhZ7AQ" name="TPolyCoeff">
-        <eAnnotations xmi:id="_yQH-ToWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQH-T4WzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-UIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG2y4aBEeaVYIZzHZR7BA" name="TPolyCoeff">
+        <eAnnotations xmi:id="_yhG2zIaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG2zYaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2zoaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQH-UYWzEeaFx5FBVhZ7AQ" name="coeff" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQH-UoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQH-U4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-VIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2z4aBEeaVYIZzHZR7BA" name="coeff" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG20IaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG20YaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG20oaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQH-VYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-VoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG204aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG21IaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQH-V4WzEeaFx5FBVhZ7AQ" name="power" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQH-WIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQH-WYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-WoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG21YaBEeaVYIZzHZR7BA" name="power" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG21oaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG214aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG22IaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQH-W4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-XIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG22YaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG22oaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQH-XYWzEeaFx5FBVhZ7AQ" name="Transform" isAbstract="true">
-        <eAnnotations xmi:id="_yQH-XoWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQH-X4WzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-YIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG224aBEeaVYIZzHZR7BA" name="Transform" isAbstract="true">
+        <eAnnotations xmi:id="_yhG23IaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG23YaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG23oaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQH-YYWzEeaFx5FBVhZ7AQ" name="Mappings">
-        <eAnnotations xmi:id="_yQH-YoWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQH-Y4WzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-ZIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG234aBEeaVYIZzHZR7BA" name="Mappings">
+        <eAnnotations xmi:id="_yhG24IaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG24YaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG24oaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQH-ZYWzEeaFx5FBVhZ7AQ" name="transforms" visibility="public" type="_yQIlN4WzEeaFx5FBVhZ7AQ" association="_yQH-bIWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQH-ZoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQH-Z4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-aIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG244aBEeaVYIZzHZR7BA" name="transforms" visibility="public" type="_yhG3DYaBEeaVYIZzHZR7BA" association="_yhG26oaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG25IaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG25YaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG25oaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQH-aYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-aoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG254aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG26IaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQH-a4WzEeaFx5FBVhZ7AQ" value="*"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG26YaBEeaVYIZzHZR7BA" value="*"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_yQH-bIWzEeaFx5FBVhZ7AQ" memberEnd="_yQH-ZYWzEeaFx5FBVhZ7AQ _yQH-bYWzEeaFx5FBVhZ7AQ">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_yQH-bYWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQH-YYWzEeaFx5FBVhZ7AQ" association="_yQH-bIWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQH-boWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQH-b4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-cIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yhG26oaBEeaVYIZzHZR7BA" memberEnd="_yhG244aBEeaVYIZzHZR7BA _yhG264aBEeaVYIZzHZR7BA">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yhG264aBEeaVYIZzHZR7BA" visibility="public" type="_yhG234aBEeaVYIZzHZR7BA" association="_yhG26oaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG27IaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG27YaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG27oaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQH-cYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-coWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG274aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG28IaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQH-c4WzEeaFx5FBVhZ7AQ"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG28YaBEeaVYIZzHZR7BA"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQH-dIWzEeaFx5FBVhZ7AQ" name="TProjection2D">
-        <eAnnotations xmi:id="_yQH-dYWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQH-doWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQH-d4WzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG28oaBEeaVYIZzHZR7BA" name="TProjection2D">
+        <eAnnotations xmi:id="_yhG284aBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG29IaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG29YaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQIlIIWzEeaFx5FBVhZ7AQ" general="_yQH-XYWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQIlIYWzEeaFx5FBVhZ7AQ" name="algorithm" visibility="public" type="_yQIlT4WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQIlIoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQIlI4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlJIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG29oaBEeaVYIZzHZR7BA" general="_yhG224aBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG294aBEeaVYIZzHZR7BA" name="algorithm" visibility="public" type="_yhG3JYaBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2-IaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2-YaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2-oaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQIlJYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlJoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG2-4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG2_IaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQIlJ4WzEeaFx5FBVhZ7AQ" name="nativeRefValue" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQIlKIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQIlKYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlKoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG2_YaBEeaVYIZzHZR7BA" name="nativeRefValue" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG2_oaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG2_4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3AIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQIlK4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlLIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG3AYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3AoaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQIlLYWzEeaFx5FBVhZ7AQ" value="2"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQIlLoWzEeaFx5FBVhZ7AQ" value="2"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG3A4aBEeaVYIZzHZR7BA" value="2"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG3BIaBEeaVYIZzHZR7BA" value="2"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQIlL4WzEeaFx5FBVhZ7AQ" name="targetRefValue" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQIlMIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQIlMYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlMoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG3BYaBEeaVYIZzHZR7BA" name="targetRefValue" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG3BoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3B4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3CIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQIlM4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlNIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG3CYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3CoaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQIlNYWzEeaFx5FBVhZ7AQ" value="2"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQIlNoWzEeaFx5FBVhZ7AQ" value="2"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG3C4aBEeaVYIZzHZR7BA" value="2"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG3DIaBEeaVYIZzHZR7BA" value="2"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQIlN4WzEeaFx5FBVhZ7AQ" name="FrameTransform">
-        <eAnnotations xmi:id="_yQIlOIWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQIlOYWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlOoWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG3DYaBEeaVYIZzHZR7BA" name="FrameTransform">
+        <eAnnotations xmi:id="_yhG3DoaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG3D4aBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3EIaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQIlO4WzEeaFx5FBVhZ7AQ" name="targetFrame" visibility="public" type="_yQJMTIWzEeaFx5FBVhZ7AQ" association="_yQIldIWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQIlPIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQIlPYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlPoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG3EYaBEeaVYIZzHZR7BA" name="targetFrame" visibility="public" type="_yhG3jYaBEeaVYIZzHZR7BA" association="_yhG3SoaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG3EoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3E4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3FIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQIlP4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlQIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG3FYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3FoaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQIlQYWzEeaFx5FBVhZ7AQ" name="operation" visibility="public" type="_yQH-XYWzEeaFx5FBVhZ7AQ" isOrdered="true" aggregation="composite" association="_yQIlSIWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQIlQoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQIlQ4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlRIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG3F4aBEeaVYIZzHZR7BA" name="operation" visibility="public" type="_yhG224aBEeaVYIZzHZR7BA" isOrdered="true" aggregation="composite" association="_yhG3HoaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG3GIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3GYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3GoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQIlRYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlRoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG3G4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3HIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQIlR4WzEeaFx5FBVhZ7AQ" value="*"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG3HYaBEeaVYIZzHZR7BA" value="*"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_yQIlSIWzEeaFx5FBVhZ7AQ" memberEnd="_yQIlQYWzEeaFx5FBVhZ7AQ _yQIlSYWzEeaFx5FBVhZ7AQ">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_yQIlSYWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQIlN4WzEeaFx5FBVhZ7AQ" association="_yQIlSIWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQIlSoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQIlS4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlTIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yhG3HoaBEeaVYIZzHZR7BA" memberEnd="_yhG3F4aBEeaVYIZzHZR7BA _yhG3H4aBEeaVYIZzHZR7BA">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yhG3H4aBEeaVYIZzHZR7BA" visibility="public" type="_yhG3DYaBEeaVYIZzHZR7BA" association="_yhG3HoaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG3IIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3IYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3IoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQIlTYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlToWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG3I4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3JIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_yQIlT4WzEeaFx5FBVhZ7AQ" name="Projection">
-        <eAnnotations xmi:id="_yQIlUIWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQIlUYWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlUoWzEeaFx5FBVhZ7AQ" value="0"/>
-          </contents>
-        </eAnnotations>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlU4WzEeaFx5FBVhZ7AQ" name="LOG"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlVIWzEeaFx5FBVhZ7AQ" name="TAN"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlVYWzEeaFx5FBVhZ7AQ" name="SIN"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlVoWzEeaFx5FBVhZ7AQ" name="STG"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlV4WzEeaFx5FBVhZ7AQ" name="ARC"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlWIWzEeaFx5FBVhZ7AQ" name="ZEA"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlWYWzEeaFx5FBVhZ7AQ" name="AIR"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlWoWzEeaFx5FBVhZ7AQ" name="CEA"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlW4WzEeaFx5FBVhZ7AQ" name="CAR"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlXIWzEeaFx5FBVhZ7AQ" name="MER"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlXYWzEeaFx5FBVhZ7AQ" name="SFL"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlXoWzEeaFx5FBVhZ7AQ" name="PAR"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlX4WzEeaFx5FBVhZ7AQ" name="MOL"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlYIWzEeaFx5FBVhZ7AQ" name="AIT"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlYYWzEeaFx5FBVhZ7AQ" name="COE"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlYoWzEeaFx5FBVhZ7AQ" name="COD"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlY4WzEeaFx5FBVhZ7AQ" name="COO"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlZIWzEeaFx5FBVhZ7AQ" name="BON"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlZYWzEeaFx5FBVhZ7AQ" name="PCO"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlZoWzEeaFx5FBVhZ7AQ" name="TSC"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlZ4WzEeaFx5FBVhZ7AQ" name="CSC"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQIlaIWzEeaFx5FBVhZ7AQ" name="QSC"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_yQIlaYWzEeaFx5FBVhZ7AQ" memberEnd="_yQJMUIWzEeaFx5FBVhZ7AQ _yQIlaoWzEeaFx5FBVhZ7AQ">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_yQIlaoWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQJMTIWzEeaFx5FBVhZ7AQ" association="_yQIlaYWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQIla4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQIlbIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlbYWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_yhG3JYaBEeaVYIZzHZR7BA" name="Projection">
+        <eAnnotations xmi:id="_yhG3JoaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG3J4aBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3KIaBEeaVYIZzHZR7BA" value="0"/>
+          </contents>
+        </eAnnotations>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3KYaBEeaVYIZzHZR7BA" name="LOG"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3KoaBEeaVYIZzHZR7BA" name="TAN"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3K4aBEeaVYIZzHZR7BA" name="SIN"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3LIaBEeaVYIZzHZR7BA" name="STG"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3LYaBEeaVYIZzHZR7BA" name="ARC"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3LoaBEeaVYIZzHZR7BA" name="ZEA"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3L4aBEeaVYIZzHZR7BA" name="AIR"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3MIaBEeaVYIZzHZR7BA" name="CEA"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3MYaBEeaVYIZzHZR7BA" name="CAR"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3MoaBEeaVYIZzHZR7BA" name="MER"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3M4aBEeaVYIZzHZR7BA" name="SFL"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3NIaBEeaVYIZzHZR7BA" name="PAR"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3NYaBEeaVYIZzHZR7BA" name="MOL"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3NoaBEeaVYIZzHZR7BA" name="AIT"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3N4aBEeaVYIZzHZR7BA" name="COE"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3OIaBEeaVYIZzHZR7BA" name="COD"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3OYaBEeaVYIZzHZR7BA" name="COO"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3OoaBEeaVYIZzHZR7BA" name="BON"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3O4aBEeaVYIZzHZR7BA" name="PCO"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3PIaBEeaVYIZzHZR7BA" name="TSC"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3PYaBEeaVYIZzHZR7BA" name="CSC"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG3PoaBEeaVYIZzHZR7BA" name="QSC"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yhG3P4aBEeaVYIZzHZR7BA" memberEnd="_yhG3kYaBEeaVYIZzHZR7BA _yhG3QIaBEeaVYIZzHZR7BA">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yhG3QIaBEeaVYIZzHZR7BA" visibility="public" type="_yhG3jYaBEeaVYIZzHZR7BA" association="_yhG3P4aBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG3QYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3QoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3Q4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQIlboWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlb4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG3RIaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3RYaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
         </ownedEnd>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_yQIlcIWzEeaFx5FBVhZ7AQ" name="coordsystem">
-      <eAnnotations xmi:id="_yQIlcYWzEeaFx5FBVhZ7AQ" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_yQIlcoWzEeaFx5FBVhZ7AQ" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlc4WzEeaFx5FBVhZ7AQ" value="0"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_yhG3RoaBEeaVYIZzHZR7BA" name="coordsystem">
+      <eAnnotations xmi:id="_yhG3R4aBEeaVYIZzHZR7BA" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_yhG3SIaBEeaVYIZzHZR7BA" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3SYaBEeaVYIZzHZR7BA" value="0"/>
         </contents>
       </eAnnotations>
-      <packagedElement xmi:type="uml:Association" xmi:id="_yQIldIWzEeaFx5FBVhZ7AQ" memberEnd="_yQIlO4WzEeaFx5FBVhZ7AQ _yQIldYWzEeaFx5FBVhZ7AQ">
-        <ownedEnd xmi:type="uml:Property" xmi:id="_yQIldYWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQIlN4WzEeaFx5FBVhZ7AQ" association="_yQIldIWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQIldoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQIld4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIleIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_yhG3SoaBEeaVYIZzHZR7BA" memberEnd="_yhG3EYaBEeaVYIZzHZR7BA _yhG3S4aBEeaVYIZzHZR7BA">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_yhG3S4aBEeaVYIZzHZR7BA" visibility="public" type="_yhG3DYaBEeaVYIZzHZR7BA" association="_yhG3SoaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG3TIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3TYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3ToaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQIleYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIleoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG3T4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3UIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQIle4WzEeaFx5FBVhZ7AQ"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG3UYaBEeaVYIZzHZR7BA"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQIlfIWzEeaFx5FBVhZ7AQ" name="CoordSys">
-        <eAnnotations xmi:id="_yQIlfYWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQIlfoWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlf4WzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG3UoaBEeaVYIZzHZR7BA" name="CoordSys">
+        <eAnnotations xmi:id="_yhG3U4aBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG3VIaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3VYaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQIlgIWzEeaFx5FBVhZ7AQ" name="genericFrame" visibility="public" type="_yQKakoWzEeaFx5FBVhZ7AQ" association="_yQKafYWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQIlgYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQIlgoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlg4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG3VoaBEeaVYIZzHZR7BA" name="genericFrame" visibility="public" type="_yhG4hIaBEeaVYIZzHZR7BA" association="_yhG4b4aBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG3V4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3WIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3WYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQIlhIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlhYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG3WoaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3W4aBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQIlhoWzEeaFx5FBVhZ7AQ" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQIlh4WzEeaFx5FBVhZ7AQ"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG3XIaBEeaVYIZzHZR7BA" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG3XYaBEeaVYIZzHZR7BA"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQIliIWzEeaFx5FBVhZ7AQ" name="AstroCoordSystem">
-        <eAnnotations xmi:id="_yQIliYWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQIlioWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIli4WzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG3XoaBEeaVYIZzHZR7BA" name="AstroCoordSystem">
+        <eAnnotations xmi:id="_yhG3X4aBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG3YIaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3YYaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <generalization xmi:type="uml:Generalization" xmi:id="_yQIljIWzEeaFx5FBVhZ7AQ" general="_yQIlfIWzEeaFx5FBVhZ7AQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQIljYWzEeaFx5FBVhZ7AQ" name="spaceFrame" visibility="public" type="_yQOEt4WzEeaFx5FBVhZ7AQ" association="_yQLos4WzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQIljoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQIlj4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlkIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_yhG3YoaBEeaVYIZzHZR7BA" general="_yhG3UoaBEeaVYIZzHZR7BA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG3Y4aBEeaVYIZzHZR7BA" name="spaceFrame" visibility="public" type="_yhG6poaBEeaVYIZzHZR7BA" association="_yhG5YYaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG3ZIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3ZYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3ZoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQIlkYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlkoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG3Z4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3aIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQIlk4WzEeaFx5FBVhZ7AQ"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG3aYaBEeaVYIZzHZR7BA"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQIllIWzEeaFx5FBVhZ7AQ" name="timeFrame" visibility="public" type="_yQRINIWzEeaFx5FBVhZ7AQ" association="_yQRILIWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQIllYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQIlloWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIll4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG3aoaBEeaVYIZzHZR7BA" name="timeFrame" visibility="public" type="_yhG9M4aBEeaVYIZzHZR7BA" association="_yhG86IaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG3a4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3bIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3bYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQIlmIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQIlmYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG3boaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3b4aBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQIlmoWzEeaFx5FBVhZ7AQ"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG3cIaBEeaVYIZzHZR7BA"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQJMMIWzEeaFx5FBVhZ7AQ" name="spectralFrame" visibility="public" type="_yQS9MoWzEeaFx5FBVhZ7AQ" association="_yQSWmoWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQJMMYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJMMoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMM4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG3cYaBEeaVYIZzHZR7BA" name="spectralFrame" visibility="public" type="_yhQmEYaBEeaVYIZzHZR7BA" association="_yhQl9oaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG3coaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3c4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3dIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQJMNIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMNYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG3dYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3doaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQJMNoWzEeaFx5FBVhZ7AQ"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG3d4aBEeaVYIZzHZR7BA"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQJMN4WzEeaFx5FBVhZ7AQ" name="redshiftFrame" visibility="public" type="_yQUycIWzEeaFx5FBVhZ7AQ" association="_yQULlIWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQJMOIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJMOYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMOoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG3eIaBEeaVYIZzHZR7BA" name="redshiftFrame" visibility="public" type="_yhQnSYaBEeaVYIZzHZR7BA" association="_yhQnKIaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG3eYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3eoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3e4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQJMO4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMPIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG3fIaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3fYaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQJMPYWzEeaFx5FBVhZ7AQ"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG3foaBEeaVYIZzHZR7BA"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQJMPoWzEeaFx5FBVhZ7AQ" name="polarizationFrame" visibility="public" type="_yQWnlIWzEeaFx5FBVhZ7AQ" association="_yQWAmIWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQJMP4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJMQIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMQYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG3f4aBEeaVYIZzHZR7BA" name="polarizationFrame" visibility="public" type="_yhQoYoaBEeaVYIZzHZR7BA" association="_yhQoPYaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG3gIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3gYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3goaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQJMQoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMQ4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG3g4aBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3hIaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQJMRIWzEeaFx5FBVhZ7AQ"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG3hYaBEeaVYIZzHZR7BA"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQJMRYWzEeaFx5FBVhZ7AQ" name="planetaryEphemeris" visibility="public" type="_yQFh6YWzEeaFx5FBVhZ7AQ" isUnique="false">
-          <eAnnotations xmi:id="_yQJMRoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJMR4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMSIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG3hoaBEeaVYIZzHZR7BA" name="planetaryEphemeris" visibility="public" type="_yhG0_YaBEeaVYIZzHZR7BA" isUnique="false">
+          <eAnnotations xmi:id="_yhG3h4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3iIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3iYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQJMSYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMSoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG3ioaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3i4aBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQJMS4WzEeaFx5FBVhZ7AQ"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG3jIaBEeaVYIZzHZR7BA"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQJMTIWzEeaFx5FBVhZ7AQ" name="CoordFrame" isAbstract="true">
-        <eAnnotations xmi:id="_yQJMTYWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQJMToWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMT4WzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG3jYaBEeaVYIZzHZR7BA" name="CoordFrame" isAbstract="true">
+        <eAnnotations xmi:id="_yhG3joaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG3j4aBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3kIaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQJMUIWzEeaFx5FBVhZ7AQ" name="mapping" visibility="public" type="_yQIlN4WzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQIlaYWzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQJMUYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJMUoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMU4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG3kYaBEeaVYIZzHZR7BA" name="mapping" visibility="public" type="_yhG3DYaBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG3P4aBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG3koaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3k4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3lIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQJMVIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMVYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG3lYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3loaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQJMVoWzEeaFx5FBVhZ7AQ" value="*"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQJMV4WzEeaFx5FBVhZ7AQ"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG3l4aBEeaVYIZzHZR7BA" value="*"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG3mIaBEeaVYIZzHZR7BA"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_yQJMWIWzEeaFx5FBVhZ7AQ" name="PixelCoordSystem">
-        <eAnnotations xmi:id="_yQJMWYWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQJMWoWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMW4WzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_yhG3mYaBEeaVYIZzHZR7BA" name="PixelCoordSystem">
+        <eAnnotations xmi:id="_yhG3moaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG3m4aBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3nIaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQJMXIWzEeaFx5FBVhZ7AQ" name="pixelFrame" visibility="public" type="_yQJzaoWzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQJMa4WzEeaFx5FBVhZ7AQ">
-          <eAnnotations xmi:id="_yQJMXYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJMXoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMX4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG3nYaBEeaVYIZzHZR7BA" name="pixelFrame" visibility="public" type="_yhG36YaBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG3rIaBEeaVYIZzHZR7BA">
+          <eAnnotations xmi:id="_yhG3noaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3n4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3oIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQJMYIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMYYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+            <contents xmi:type="uml:Property" xmi:id="_yhG3oYaBEeaVYIZzHZR7BA" name="AccessMode">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3ooaBEeaVYIZzHZR7BA" value="read_write"/>
             </contents>
           </eAnnotations>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQJMYoWzEeaFx5FBVhZ7AQ" value="*"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG3o4aBEeaVYIZzHZR7BA" value="*"/>
         </ownedAttribute>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_yQJMY4WzEeaFx5FBVhZ7AQ" name="domain">
-      <eAnnotations xmi:id="_yQJMZIWzEeaFx5FBVhZ7AQ" source="Objing">
-        <contents xmi:type="uml:Property" xmi:id="_yQJMZYWzEeaFx5FBVhZ7AQ" name="Visibility">
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMZoWzEeaFx5FBVhZ7AQ" value="0"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_yhG3pIaBEeaVYIZzHZR7BA" name="domain">
+      <eAnnotations xmi:id="_yhG3pYaBEeaVYIZzHZR7BA" source="Objing">
+        <contents xmi:type="uml:Property" xmi:id="_yhG3poaBEeaVYIZzHZR7BA" name="Visibility">
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3p4aBEeaVYIZzHZR7BA" value="0"/>
         </contents>
       </eAnnotations>
-      <packagedElement xmi:type="uml:Package" xmi:id="_yQJMZ4WzEeaFx5FBVhZ7AQ" name="pixel">
-        <eAnnotations xmi:id="_yQJMaIWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQJMaYWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMaoWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Package" xmi:id="_yhG3qIaBEeaVYIZzHZR7BA" name="pixel">
+        <eAnnotations xmi:id="_yhG3qYaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG3qoaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3q4aBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQJMa4WzEeaFx5FBVhZ7AQ" memberEnd="_yQJMXIWzEeaFx5FBVhZ7AQ _yQJMbIWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQJMbIWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQJMWIWzEeaFx5FBVhZ7AQ" association="_yQJMa4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQJMbYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQJMboWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMb4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG3rIaBEeaVYIZzHZR7BA" memberEnd="_yhG3nYaBEeaVYIZzHZR7BA _yhG3rYaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG3rYaBEeaVYIZzHZR7BA" visibility="public" type="_yhG3mYaBEeaVYIZzHZR7BA" association="_yhG3rIaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG3roaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG3r4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3sIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQJMcIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMcYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG3sYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3soaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQJMcoWzEeaFx5FBVhZ7AQ" name="AssociatedQuantity">
-          <eAnnotations xmi:id="_yQJMc4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJMdIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMdYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_yhG3s4aBEeaVYIZzHZR7BA" name="PixelCoord" isAbstract="true">
+          <eAnnotations xmi:id="_yhG3tIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3tYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3toaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQJMdoWzEeaFx5FBVhZ7AQ" name="axis" visibility="public" type="_yQJzioWzEeaFx5FBVhZ7AQ" association="_yQJMg4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQJMd4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQJMeIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMeYWzEeaFx5FBVhZ7AQ" value="0"/>
-              </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQJMeoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMe4WzEeaFx5FBVhZ7AQ" value="read_write"/>
-              </contents>
-            </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQJMfIWzEeaFx5FBVhZ7AQ"/>
-          </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQJMfYWzEeaFx5FBVhZ7AQ" name="loc" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQJMfoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQJMf4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMgIWzEeaFx5FBVhZ7AQ" value="0"/>
-              </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQJMgYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJMgoWzEeaFx5FBVhZ7AQ" value="read_write"/>
-              </contents>
-            </eAnnotations>
-          </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQJMg4WzEeaFx5FBVhZ7AQ" memberEnd="_yQJMdoWzEeaFx5FBVhZ7AQ _yQJMhIWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQJMhIWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQJMcoWzEeaFx5FBVhZ7AQ" association="_yQJMg4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQJMhYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQJzQIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzQYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_yhG3t4aBEeaVYIZzHZR7BA" name="PixelCoord1D">
+          <eAnnotations xmi:id="_yhG3uIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3uYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3uoaBEeaVYIZzHZR7BA" value="0"/>
+            </contents>
+          </eAnnotations>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG3u4aBEeaVYIZzHZR7BA" general="_yhG3s4aBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG3vIaBEeaVYIZzHZR7BA" name="elem" visibility="public" type="_yhG4UoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG3vYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG3voaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3v4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQJzQoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzQ4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG3wIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3wYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQJzRIWzEeaFx5FBVhZ7AQ"/>
-          </ownedEnd>
+          </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_yQJzRYWzEeaFx5FBVhZ7AQ" name="PixelCoord" isAbstract="true">
-          <eAnnotations xmi:id="_yQJzRoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJzR4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzSIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_yhG3woaBEeaVYIZzHZR7BA" name="PixelCoord2D">
+          <eAnnotations xmi:id="_yhG3w4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG3xIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3xYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQJzSYWzEeaFx5FBVhZ7AQ" name="elem" visibility="public" type="_yQJMcoWzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQJzUYWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQJzSoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQJzS4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzTIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG3xoaBEeaVYIZzHZR7BA" general="_yhG3s4aBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG3x4aBEeaVYIZzHZR7BA" name="elem" visibility="public" type="_yhG4UoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG3yIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG3yYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3yoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQJzTYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzToWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG3y4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3zIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQJzT4WzEeaFx5FBVhZ7AQ" value="*"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQJzUIWzEeaFx5FBVhZ7AQ"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG3zYaBEeaVYIZzHZR7BA" value="2"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG3zoaBEeaVYIZzHZR7BA" value="2"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQJzUYWzEeaFx5FBVhZ7AQ" memberEnd="_yQJzSYWzEeaFx5FBVhZ7AQ _yQJzUoWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQJzUoWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQJzRYWzEeaFx5FBVhZ7AQ" association="_yQJzUYWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQJzU4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQJzVIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzVYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_yhG3z4aBEeaVYIZzHZR7BA" name="PixellCoord3D">
+          <eAnnotations xmi:id="_yhG30IaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG30YaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG30oaBEeaVYIZzHZR7BA" value="0"/>
+            </contents>
+          </eAnnotations>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG304aBEeaVYIZzHZR7BA" general="_yhG3s4aBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG31IaBEeaVYIZzHZR7BA" name="elem" visibility="public" type="_yhG4UoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG31YaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG31oaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG314aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQJzVoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzV4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG32IaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG32YaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-          </ownedEnd>
-        </packagedElement>
-        <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQJzWIWzEeaFx5FBVhZ7AQ" name="PixelCoord1D">
-          <eAnnotations xmi:id="_yQJzWYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJzWoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzW4WzEeaFx5FBVhZ7AQ" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQJzXIWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
-          </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQJzXYWzEeaFx5FBVhZ7AQ" general="_yQJzRYWzEeaFx5FBVhZ7AQ"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG32oaBEeaVYIZzHZR7BA" value="3"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG324aBEeaVYIZzHZR7BA" value="3"/>
+          </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQJzXoWzEeaFx5FBVhZ7AQ" name="PixellCoord3D">
-          <eAnnotations xmi:id="_yQJzX4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJzYIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzYYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG33IaBEeaVYIZzHZR7BA" name="PixelBasis" isAbstract="true">
+          <eAnnotations xmi:id="_yhG33YaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG33oaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG334aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQJzYoWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQJzY4WzEeaFx5FBVhZ7AQ" general="_yQJzRYWzEeaFx5FBVhZ7AQ"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQJzZIWzEeaFx5FBVhZ7AQ" name="PixelCoord2D">
-          <eAnnotations xmi:id="_yQJzZYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJzZoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzZ4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG34IaBEeaVYIZzHZR7BA" name="StdPixelBasis">
+          <eAnnotations xmi:id="_yhG34YaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG34oaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG344aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQJzaIWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQJzaYWzEeaFx5FBVhZ7AQ" general="_yQJzRYWzEeaFx5FBVhZ7AQ"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yhG35IaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG35YaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG35oaBEeaVYIZzHZR7BA" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG354aBEeaVYIZzHZR7BA" value="comment"/>
+              </contents>
+            </eAnnotations>
+            <body>origin: 0.0
+dimensionality: nD
+orientation: n/a
+
+</body>
+          </ownedComment>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG36IaBEeaVYIZzHZR7BA" general="_yhG33IaBEeaVYIZzHZR7BA"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQJzaoWzEeaFx5FBVhZ7AQ" name="PixelFrame">
-          <eAnnotations xmi:id="_yQJza4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJzbIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzbYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG36YaBEeaVYIZzHZR7BA" name="PixelFrame">
+          <eAnnotations xmi:id="_yhG36oaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG364aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG37IaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQJzboWzEeaFx5FBVhZ7AQ" general="_yQJMTIWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQJzb4WzEeaFx5FBVhZ7AQ" name="basis" visibility="public" type="_yQKaWoWzEeaFx5FBVhZ7AQ" association="_yQJze4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQJzcIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQJzcYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzcoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG37YaBEeaVYIZzHZR7BA" general="_yhG3jYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG37oaBEeaVYIZzHZR7BA" name="basis" visibility="public" type="_yhG33IaBEeaVYIZzHZR7BA" association="_yhG3-oaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG374aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG38IaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG38YaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQJzc4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzdIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG38oaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG384aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQJzdYWzEeaFx5FBVhZ7AQ" name="pixelSpace" visibility="public" type="_yQKaZ4WzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQJzg4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQJzdoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQJzd4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzeIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG39IaBEeaVYIZzHZR7BA" name="pixelSpace" visibility="public" type="_yhG4CYaBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG4AoaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG39YaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG39oaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG394aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQJzeYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzeoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG3-IaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3-YaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQJze4WzEeaFx5FBVhZ7AQ" memberEnd="_yQJzb4WzEeaFx5FBVhZ7AQ _yQJzfIWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQJzfIWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQJzaoWzEeaFx5FBVhZ7AQ" association="_yQJze4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQJzfYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQJzfoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzf4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG3-oaBEeaVYIZzHZR7BA" memberEnd="_yhG37oaBEeaVYIZzHZR7BA _yhG3-4aBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG3-4aBEeaVYIZzHZR7BA" visibility="public" type="_yhG36YaBEeaVYIZzHZR7BA" association="_yhG3-oaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG3_IaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG3_YaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG3_oaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQJzgIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzgYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG3_4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4AIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQJzgoWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG4AYaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQJzg4WzEeaFx5FBVhZ7AQ" memberEnd="_yQJzdYWzEeaFx5FBVhZ7AQ _yQJzhIWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQJzhIWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQJzaoWzEeaFx5FBVhZ7AQ" association="_yQJzg4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQJzhYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQJzhoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzh4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG4AoaBEeaVYIZzHZR7BA" memberEnd="_yhG39IaBEeaVYIZzHZR7BA _yhG4A4aBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG4A4aBEeaVYIZzHZR7BA" visibility="public" type="_yhG36YaBEeaVYIZzHZR7BA" association="_yhG4AoaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG4BIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4BYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4BoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQJziIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJziYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4B4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4CIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQJzioWzEeaFx5FBVhZ7AQ" name="PixelAxis">
-          <eAnnotations xmi:id="_yQJzi4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJzjIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzjYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG4CYaBEeaVYIZzHZR7BA" name="PixelSpace">
+          <eAnnotations xmi:id="_yhG4CoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG4C4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4DIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQJzjoWzEeaFx5FBVhZ7AQ" name="length" visibility="public" type="_yQFh0IWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQJzj4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQJzkIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzkYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG4DYaBEeaVYIZzHZR7BA" name="axis" visibility="public" type="_yhG4G4aBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG4FIaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG4DoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4D4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4EIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQJzkoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzk4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4EYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4EoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG4E4aBEeaVYIZzHZR7BA" value="*"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQJzlIWzEeaFx5FBVhZ7AQ" name="Pixel" isAbstract="true">
-          <eAnnotations xmi:id="_yQJzlYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJzloWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzl4WzEeaFx5FBVhZ7AQ" value="0"/>
-            </contents>
-          </eAnnotations>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG4FIaBEeaVYIZzHZR7BA" memberEnd="_yhG4DYaBEeaVYIZzHZR7BA _yhG4FYaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG4FYaBEeaVYIZzHZR7BA" visibility="public" type="_yhG4CYaBEeaVYIZzHZR7BA" association="_yhG4FIaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG4FoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4F4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4GIaBEeaVYIZzHZR7BA" value="0"/>
+              </contents>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4GYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4GoaBEeaVYIZzHZR7BA" value="read_write"/>
+              </contents>
+            </eAnnotations>
+          </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQJzmIWzEeaFx5FBVhZ7AQ" name="Pixel1D">
-          <eAnnotations xmi:id="_yQJzmYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJzmoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzm4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG4G4aBEeaVYIZzHZR7BA" name="PixelAxis">
+          <eAnnotations xmi:id="_yhG4HIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG4HYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4HoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQJznIWzEeaFx5FBVhZ7AQ" general="_yQJzlIWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQJznYWzEeaFx5FBVhZ7AQ" name="coord" visibility="public" type="_yQJzWIWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQJznoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQJzn4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzoIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG4H4aBEeaVYIZzHZR7BA" name="length" visibility="public" type="_yhG05IaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG4IIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4IYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4IoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQJzoYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzooWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4I4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4JIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQJzo4WzEeaFx5FBVhZ7AQ" name="Pixel2D">
-          <eAnnotations xmi:id="_yQJzpIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJzpYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzpoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG4JYaBEeaVYIZzHZR7BA" name="Pixel" isAbstract="true">
+          <eAnnotations xmi:id="_yhG4JoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG4J4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4KIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQJzp4WzEeaFx5FBVhZ7AQ" general="_yQJzlIWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQJzqIWzEeaFx5FBVhZ7AQ" name="coord" visibility="public" type="_yQJzZIWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQJzqYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQJzqoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzq4WzEeaFx5FBVhZ7AQ" value="0"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG4KYaBEeaVYIZzHZR7BA" name="Pixel1D">
+          <eAnnotations xmi:id="_yhG4KoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG4K4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4LIaBEeaVYIZzHZR7BA" value="0"/>
+            </contents>
+          </eAnnotations>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG4LYaBEeaVYIZzHZR7BA" general="_yhG4JYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG4LoaBEeaVYIZzHZR7BA" name="coord" visibility="public" type="_yhG3t4aBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG4L4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4MIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4MYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQJzrIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzrYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4MoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4M4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQJzroWzEeaFx5FBVhZ7AQ" name="Pixel3D">
-          <eAnnotations xmi:id="_yQJzr4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQJzsIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJzsYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG4NIaBEeaVYIZzHZR7BA" name="Pixel2D">
+          <eAnnotations xmi:id="_yhG4NYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG4NoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4N4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQJzsoWzEeaFx5FBVhZ7AQ" general="_yQJzlIWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQJzs4WzEeaFx5FBVhZ7AQ" name="coord" visibility="public" type="_yQJzXoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQJztIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQJztYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQJztoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG4OIaBEeaVYIZzHZR7BA" general="_yhG4JYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG4OYaBEeaVYIZzHZR7BA" name="coord" visibility="public" type="_yhG3woaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG4OoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4O4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4PIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQKaUIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKaUYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4PYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4PoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:InformationItem" xmi:id="_yQKaUoWzEeaFx5FBVhZ7AQ" name="Uncertainty?">
-          <eAnnotations xmi:id="_yQKaU4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQKaVIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKaVYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG4P4aBEeaVYIZzHZR7BA" name="Pixel3D">
+          <eAnnotations xmi:id="_yhG4QIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG4QYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4QoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG4Q4aBEeaVYIZzHZR7BA" general="_yhG4JYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG4RIaBEeaVYIZzHZR7BA" name="coord" visibility="public" type="_yhG3z4aBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG4RYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4RoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4R4aBEeaVYIZzHZR7BA" value="0"/>
+              </contents>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4SIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4SYaBEeaVYIZzHZR7BA" value="read_write"/>
+              </contents>
+            </eAnnotations>
+          </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:InformationItem" xmi:id="_yQKaVoWzEeaFx5FBVhZ7AQ" name="Pixel Domain Package">
-          <eAnnotations xmi:id="_yQKaV4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQKaWIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKaWYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:InformationItem" xmi:id="_yhG4SoaBEeaVYIZzHZR7BA" name="Uncertainty?">
+          <eAnnotations xmi:id="_yhG4S4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG4TIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4TYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQKaWoWzEeaFx5FBVhZ7AQ" name="PixelBasis" isAbstract="true">
-          <eAnnotations xmi:id="_yQKaW4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQKaXIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKaXYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:InformationItem" xmi:id="_yhG4ToaBEeaVYIZzHZR7BA" name="Pixel Domain Package">
+          <eAnnotations xmi:id="_yhG4T4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG4UIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4UYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQKaXoWzEeaFx5FBVhZ7AQ" name="StdPixelBasis">
-          <eAnnotations xmi:id="_yQKaX4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQKaYIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKaYYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_yhG4UoaBEeaVYIZzHZR7BA" name="AssociatedValue">
+          <eAnnotations xmi:id="_yhG4U4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG4VIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4VYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_yQKaYoWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQKaY4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQKaZIWzEeaFx5FBVhZ7AQ" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKaZYWzEeaFx5FBVhZ7AQ" value="comment"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG4VoaBEeaVYIZzHZR7BA" name="axis" visibility="public" type="_yhG4G4aBEeaVYIZzHZR7BA" association="_yhG4Y4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG4V4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4WIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4WYaBEeaVYIZzHZR7BA" value="0"/>
+              </contents>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4WoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4W4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <body>origin: 0.0
-dimensionality: nD
-orientation: n/a
-
-</body>
-          </ownedComment>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQKaZoWzEeaFx5FBVhZ7AQ" general="_yQKaWoWzEeaFx5FBVhZ7AQ"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQKaZ4WzEeaFx5FBVhZ7AQ" name="PixelSpace">
-          <eAnnotations xmi:id="_yQKaaIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQKaaYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKaaoWzEeaFx5FBVhZ7AQ" value="0"/>
-            </contents>
-          </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQKaa4WzEeaFx5FBVhZ7AQ" name="axis" visibility="public" type="_yQJzioWzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQKacoWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQKabIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQKabYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKaboWzEeaFx5FBVhZ7AQ" value="0"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG4XIaBEeaVYIZzHZR7BA"/>
+          </ownedAttribute>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG4XYaBEeaVYIZzHZR7BA" name="loc" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG4XoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4X4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4YIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQKab4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKacIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4YYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4YoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQKacYWzEeaFx5FBVhZ7AQ" value="*"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQKacoWzEeaFx5FBVhZ7AQ" memberEnd="_yQKaa4WzEeaFx5FBVhZ7AQ _yQKac4WzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQKac4WzEeaFx5FBVhZ7AQ" visibility="public" type="_yQKaZ4WzEeaFx5FBVhZ7AQ" association="_yQKacoWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQKadIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQKadYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKadoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG4Y4aBEeaVYIZzHZR7BA" memberEnd="_yhG4VoaBEeaVYIZzHZR7BA _yhG4ZIaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG4ZIaBEeaVYIZzHZR7BA" visibility="public" type="_yhG4UoaBEeaVYIZzHZR7BA" association="_yhG4Y4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG4ZYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4ZoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4Z4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQKad4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKaeIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4aIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4aYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG4aoaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
       </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_yQKaeYWzEeaFx5FBVhZ7AQ" name="generic">
-        <eAnnotations xmi:id="_yQKaeoWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQKae4WzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKafIWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Package" xmi:id="_yhG4a4aBEeaVYIZzHZR7BA" name="generic">
+        <eAnnotations xmi:id="_yhG4bIaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG4bYaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4boaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQKafYWzEeaFx5FBVhZ7AQ" memberEnd="_yQIlgIWzEeaFx5FBVhZ7AQ _yQKafoWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQKafoWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQIlfIWzEeaFx5FBVhZ7AQ" association="_yQKafYWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQKaf4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQKagIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKagYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG4b4aBEeaVYIZzHZR7BA" memberEnd="_yhG3VoaBEeaVYIZzHZR7BA _yhG4cIaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG4cIaBEeaVYIZzHZR7BA" visibility="public" type="_yhG3UoaBEeaVYIZzHZR7BA" association="_yhG4b4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG4cYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4coaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4c4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQKagoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKag4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4dIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4dYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQKahIWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG4doaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQKahYWzEeaFx5FBVhZ7AQ" name="GenericBasis" isAbstract="true">
-          <eAnnotations xmi:id="_yQKahoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQKah4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKaiIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG4d4aBEeaVYIZzHZR7BA" name="GenericBasis" isAbstract="true">
+          <eAnnotations xmi:id="_yhG4eIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG4eYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4eoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQKaiYWzEeaFx5FBVhZ7AQ" name="StdGenericBasis">
-          <eAnnotations xmi:id="_yQKaioWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQKai4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKajIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG4e4aBEeaVYIZzHZR7BA" name="StdGenericBasis">
+          <eAnnotations xmi:id="_yhG4fIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG4fYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4foaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_yQKajYWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQKajoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQKaj4WzEeaFx5FBVhZ7AQ" name="NoteType_Name">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKakIWzEeaFx5FBVhZ7AQ" value="comment"/>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_yhG4f4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG4gIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4gYaBEeaVYIZzHZR7BA" name="NoteType_Name">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4goaBEeaVYIZzHZR7BA" value="comment"/>
               </contents>
             </eAnnotations>
             <body>origin: 0.0
@@ -1573,2931 +1559,2901 @@
 orientation: irrelevant
 </body>
           </ownedComment>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQKakYWzEeaFx5FBVhZ7AQ" general="_yQKahYWzEeaFx5FBVhZ7AQ"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG4g4aBEeaVYIZzHZR7BA" general="_yhG4d4aBEeaVYIZzHZR7BA"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQKakoWzEeaFx5FBVhZ7AQ" name="GenericFrame">
-          <eAnnotations xmi:id="_yQKak4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQKalIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKalYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG4hIaBEeaVYIZzHZR7BA" name="GenericFrame">
+          <eAnnotations xmi:id="_yhG4hYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG4hoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4h4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQKaloWzEeaFx5FBVhZ7AQ" general="_yQJMTIWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQKal4WzEeaFx5FBVhZ7AQ" name="basis" visibility="public" type="_yQKahYWzEeaFx5FBVhZ7AQ" association="_yQKao4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQKamIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQKamYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKamoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG4iIaBEeaVYIZzHZR7BA" general="_yhG3jYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG4iYaBEeaVYIZzHZR7BA" name="basis" visibility="public" type="_yhG4d4aBEeaVYIZzHZR7BA" association="_yhG4lYaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG4ioaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4i4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4jIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQKam4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKanIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4jYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4joaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQKanYWzEeaFx5FBVhZ7AQ" name="coordSpace" visibility="public" type="_yQLBcoWzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQKaq4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQKanoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQKan4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKaoIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG4j4aBEeaVYIZzHZR7BA" name="coordSpace" visibility="public" type="_yhG4wIaBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG4nYaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG4kIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4kYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4koaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQKaoYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKaooWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4k4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4lIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQKao4WzEeaFx5FBVhZ7AQ" memberEnd="_yQKal4WzEeaFx5FBVhZ7AQ _yQKapIWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQKapIWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQKakoWzEeaFx5FBVhZ7AQ" association="_yQKao4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQKapYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQKapoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKap4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG4lYaBEeaVYIZzHZR7BA" memberEnd="_yhG4iYaBEeaVYIZzHZR7BA _yhG4loaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG4loaBEeaVYIZzHZR7BA" visibility="public" type="_yhG4hIaBEeaVYIZzHZR7BA" association="_yhG4lYaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG4l4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4mIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4mYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQKaqIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKaqYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4moaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4m4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQKaqoWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG4nIaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQKaq4WzEeaFx5FBVhZ7AQ" memberEnd="_yQKanYWzEeaFx5FBVhZ7AQ _yQKarIWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQKarIWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQKakoWzEeaFx5FBVhZ7AQ" association="_yQKaq4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQKarYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQKaroWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKar4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG4nYaBEeaVYIZzHZR7BA" memberEnd="_yhG4j4aBEeaVYIZzHZR7BA _yhG4noaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG4noaBEeaVYIZzHZR7BA" visibility="public" type="_yhG4hIaBEeaVYIZzHZR7BA" association="_yhG4nYaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG4n4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4oIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4oYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQKasIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKasYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4ooaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4o4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQKasoWzEeaFx5FBVhZ7AQ" name="CoordAxis">
-          <eAnnotations xmi:id="_yQKas4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQKatIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKatYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG4pIaBEeaVYIZzHZR7BA" name="CoordAxis">
+          <eAnnotations xmi:id="_yhG4pYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG4poaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4p4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQKatoWzEeaFx5FBVhZ7AQ" name="domainMin" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQKat4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQKauIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKauYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG4qIaBEeaVYIZzHZR7BA" name="domainMin" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG4qYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4qoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4q4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQKauoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKau4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4rIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4rYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQKavIWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG4roaBEeaVYIZzHZR7BA"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQKavYWzEeaFx5FBVhZ7AQ" name="domainMax" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQKavoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQKav4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKawIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG4r4aBEeaVYIZzHZR7BA" name="domainMax" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG4sIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4sYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4soaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQKawYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQKawoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4s4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4tIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQKaw4WzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG4tYaBEeaVYIZzHZR7BA"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQLBYIWzEeaFx5FBVhZ7AQ" name="GenericCoord">
-          <eAnnotations xmi:id="_yQLBYYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQLBYoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBY4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_yhG4toaBEeaVYIZzHZR7BA" name="GenericCoord">
+          <eAnnotations xmi:id="_yhG4t4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG4uIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4uYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQLBZIWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLBZYWzEeaFx5FBVhZ7AQ" name="elem" visibility="public" type="_yQLokoWzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQLBa4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQLBZoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLBZ4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBaIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG4uoaBEeaVYIZzHZR7BA" name="elem" visibility="public" type="_yhG5RIaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG4u4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4vIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4vYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLBaYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBaoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4voaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4v4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQLBa4WzEeaFx5FBVhZ7AQ" memberEnd="_yQLBZYWzEeaFx5FBVhZ7AQ _yQLBbIWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQLBbIWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQLBYIWzEeaFx5FBVhZ7AQ" association="_yQLBa4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQLBbYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLBboWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBb4WzEeaFx5FBVhZ7AQ" value="0"/>
-              </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLBcIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBcYWzEeaFx5FBVhZ7AQ" value="read_write"/>
-              </contents>
-            </eAnnotations>
-          </ownedEnd>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQLBcoWzEeaFx5FBVhZ7AQ" name="CoordSpace" isAbstract="true">
-          <eAnnotations xmi:id="_yQLBc4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQLBdIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBdYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG4wIaBEeaVYIZzHZR7BA" name="CoordSpace" isAbstract="true">
+          <eAnnotations xmi:id="_yhG4wYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG4woaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4w4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLBdoWzEeaFx5FBVhZ7AQ" name="axis" visibility="public" type="_yQKasoWzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQLBfIWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQLBd4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLBeIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBeYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG4xIaBEeaVYIZzHZR7BA" name="axis" visibility="public" type="_yhG4pIaBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG4yoaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG4xYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4xoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4x4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLBeoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBe4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4yIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4yYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQLBfIWzEeaFx5FBVhZ7AQ" memberEnd="_yQLBdoWzEeaFx5FBVhZ7AQ _yQLBfYWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQLBfYWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQLBcoWzEeaFx5FBVhZ7AQ" association="_yQLBfIWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQLBfoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLBf4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBgIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG4yoaBEeaVYIZzHZR7BA" memberEnd="_yhG4xIaBEeaVYIZzHZR7BA _yhG4y4aBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG4y4aBEeaVYIZzHZR7BA" visibility="public" type="_yhG4wIaBEeaVYIZzHZR7BA" association="_yhG4yoaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG4zIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4zYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4zoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLBgYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBgoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4z4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG40IaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQLBg4WzEeaFx5FBVhZ7AQ" name="Cartesian">
-          <eAnnotations xmi:id="_yQLBhIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQLBhYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBhoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG40YaBEeaVYIZzHZR7BA" name="Cartesian">
+          <eAnnotations xmi:id="_yhG40oaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG404aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG41IaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQLBh4WzEeaFx5FBVhZ7AQ" general="_yQLBcoWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLBiIWzEeaFx5FBVhZ7AQ" name="x" visibility="public" type="_yQKasoWzEeaFx5FBVhZ7AQ" association="_yQLBjoWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQLBiYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLBioWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBi4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG41YaBEeaVYIZzHZR7BA" general="_yhG4wIaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG41oaBEeaVYIZzHZR7BA" name="x" visibility="public" type="_yhG4pIaBEeaVYIZzHZR7BA" association="_yhG43IaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG414aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG42IaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG42YaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLBjIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBjYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG42oaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG424aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQLBjoWzEeaFx5FBVhZ7AQ" memberEnd="_yQLBiIWzEeaFx5FBVhZ7AQ _yQLBj4WzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQLBj4WzEeaFx5FBVhZ7AQ" visibility="public" type="_yQLBg4WzEeaFx5FBVhZ7AQ" association="_yQLBjoWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQLBkIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLBkYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBkoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG43IaBEeaVYIZzHZR7BA" memberEnd="_yhG41oaBEeaVYIZzHZR7BA _yhG43YaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG43YaBEeaVYIZzHZR7BA" visibility="public" type="_yhG40YaBEeaVYIZzHZR7BA" association="_yhG43IaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG43oaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG434aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG44IaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLBk4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBlIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG44YaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG44oaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQLBlYWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG444aBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQLBloWzEeaFx5FBVhZ7AQ" name="Measurement">
-          <eAnnotations xmi:id="_yQLBl4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQLBmIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBmYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG45IaBEeaVYIZzHZR7BA" name="Measurement">
+          <eAnnotations xmi:id="_yhG45YaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG45oaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG454aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLBmoWzEeaFx5FBVhZ7AQ" name="error" visibility="public" type="_yQLBr4WzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQLBqIWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQLBm4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLBnIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBnYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG46IaBEeaVYIZzHZR7BA" name="error" visibility="public" type="_yhG4_YaBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG49oaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG46YaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG46oaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG464aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLBnoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBn4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG47IaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG47YaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQLBoIWzEeaFx5FBVhZ7AQ" value="*"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQLBoYWzEeaFx5FBVhZ7AQ"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG47oaBEeaVYIZzHZR7BA" value="*"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG474aBEeaVYIZzHZR7BA"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLBooWzEeaFx5FBVhZ7AQ" name="coord" visibility="public" type="_yQLBYIWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQLBo4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLBpIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBpYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG48IaBEeaVYIZzHZR7BA" name="coord" visibility="public" type="_yhG4toaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG48YaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG48oaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG484aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLBpoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBp4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG49IaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG49YaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQLBqIWzEeaFx5FBVhZ7AQ" memberEnd="_yQLBmoWzEeaFx5FBVhZ7AQ _yQLBqYWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQLBqYWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQLBloWzEeaFx5FBVhZ7AQ" association="_yQLBqIWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQLBqoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLBq4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBrIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG49oaBEeaVYIZzHZR7BA" memberEnd="_yhG46IaBEeaVYIZzHZR7BA _yhG494aBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG494aBEeaVYIZzHZR7BA" visibility="public" type="_yhG45IaBEeaVYIZzHZR7BA" association="_yhG49oaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG4-IaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG4-YaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4-oaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLBrYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBroWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG4-4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG4_IaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQLBr4WzEeaFx5FBVhZ7AQ" name="Uncertainty" isAbstract="true">
-          <eAnnotations xmi:id="_yQLBsIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQLBsYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBsoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG4_YaBEeaVYIZzHZR7BA" name="Uncertainty" isAbstract="true">
+          <eAnnotations xmi:id="_yhG4_oaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG4_4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5AIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLBs4WzEeaFx5FBVhZ7AQ" name="flavor" visibility="public" type="_yQFh6YWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQLBtIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLBtYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBtoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5AYaBEeaVYIZzHZR7BA" name="flavor" visibility="public" type="_yhG0_YaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG5AoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5A4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5BIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLBt4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBuIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5BYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5BoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQLBuYWzEeaFx5FBVhZ7AQ" name="Bounds">
-          <eAnnotations xmi:id="_yQLBuoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQLBu4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBvIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG5B4aBEeaVYIZzHZR7BA" name="Bounds">
+          <eAnnotations xmi:id="_yhG5CIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG5CYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5CoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQLBvYWzEeaFx5FBVhZ7AQ" general="_yQLBr4WzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLBvoWzEeaFx5FBVhZ7AQ" name="hiLimit" visibility="public" type="_yQLBYIWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQLBv4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLBwIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBwYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG5C4aBEeaVYIZzHZR7BA" general="_yhG4_YaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5DIaBEeaVYIZzHZR7BA" name="hiLimit" visibility="public" type="_yhG4toaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG5DYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5DoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5D4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLBwoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBw4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5EIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5EYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLBxIWzEeaFx5FBVhZ7AQ" name="loLimit" visibility="public" type="_yQLBYIWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQLBxYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLBxoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBx4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5EoaBEeaVYIZzHZR7BA" name="loLimit" visibility="public" type="_yhG4toaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG5E4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5FIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5FYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLByIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLByYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5FoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5F4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQLByoWzEeaFx5FBVhZ7AQ" name="SymmetricInterval">
-          <eAnnotations xmi:id="_yQLBy4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQLBzIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLBzYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG5GIaBEeaVYIZzHZR7BA" name="SymmetricInterval">
+          <eAnnotations xmi:id="_yhG5GYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG5GoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5G4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQLBzoWzEeaFx5FBVhZ7AQ" general="_yQLBr4WzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLBz4WzEeaFx5FBVhZ7AQ" name="center" visibility="public" type="_yQLBYIWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQLocIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLocYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLocoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG5HIaBEeaVYIZzHZR7BA" general="_yhG4_YaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5HYaBEeaVYIZzHZR7BA" name="center" visibility="public" type="_yhG4toaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG5HoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5H4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5IIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLoc4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLodIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5IYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5IoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLodYWzEeaFx5FBVhZ7AQ" name="size" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQLodoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLod4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLoeIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5I4aBEeaVYIZzHZR7BA" name="size" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG5JIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5JYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5JoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLoeYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLoeoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5J4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5KIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQLoe4WzEeaFx5FBVhZ7AQ" name="AssymetricInterval">
-          <eAnnotations xmi:id="_yQLofIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQLofYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLofoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG5KYaBEeaVYIZzHZR7BA" name="AssymetricInterval">
+          <eAnnotations xmi:id="_yhG5KoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG5K4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5LIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQLof4WzEeaFx5FBVhZ7AQ" general="_yQLBr4WzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLogIWzEeaFx5FBVhZ7AQ" name="center" visibility="public" type="_yQLBYIWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQLogYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLogoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLog4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG5LYaBEeaVYIZzHZR7BA" general="_yhG4_YaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5LoaBEeaVYIZzHZR7BA" name="center" visibility="public" type="_yhG4toaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG5L4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5MIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5MYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLohIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLohYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5MoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5M4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLohoWzEeaFx5FBVhZ7AQ" name="plus" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQLoh4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLoiIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLoiYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5NIaBEeaVYIZzHZR7BA" name="plus" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG5NYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5NoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5N4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLoioWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLoi4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5OIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5OYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLojIWzEeaFx5FBVhZ7AQ" name="minus" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQLojYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLojoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLoj4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5OoaBEeaVYIZzHZR7BA" name="minus" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG5O4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5PIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5PYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLokIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLokYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5PoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5P4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQLokoWzEeaFx5FBVhZ7AQ" name="AssociatedQuantity">
-          <eAnnotations xmi:id="_yQLok4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQLolIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLolYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:InformationItem" xmi:id="_yhG5QIaBEeaVYIZzHZR7BA" name="Generic Domain Package">
+          <eAnnotations xmi:id="_yhG5QYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG5QoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5Q4aBEeaVYIZzHZR7BA" value="0"/>
+            </contents>
+          </eAnnotations>
+        </packagedElement>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_yhG5RIaBEeaVYIZzHZR7BA" name="AssociatedValue">
+          <eAnnotations xmi:id="_yhG5RYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG5RoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5R4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLoloWzEeaFx5FBVhZ7AQ" name="axis" visibility="public" type="_yQKasoWzEeaFx5FBVhZ7AQ" association="_yQLoo4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQLol4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLomIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLomYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5SIaBEeaVYIZzHZR7BA" name="axis" visibility="public" type="_yhG4pIaBEeaVYIZzHZR7BA" association="_yhG5VYaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG5SYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5SoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5S4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLomoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLom4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5TIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5TYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQLonIWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG5ToaBEeaVYIZzHZR7BA"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLonYWzEeaFx5FBVhZ7AQ" name="loc" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQLonoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLon4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLooIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5T4aBEeaVYIZzHZR7BA" name="loc" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG5UIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5UYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5UoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLooYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLoooWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5U4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5VIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQLoo4WzEeaFx5FBVhZ7AQ" memberEnd="_yQLoloWzEeaFx5FBVhZ7AQ _yQLopIWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQLopIWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQLokoWzEeaFx5FBVhZ7AQ" association="_yQLoo4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQLopYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLopoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLop4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG5VYaBEeaVYIZzHZR7BA" memberEnd="_yhG5SIaBEeaVYIZzHZR7BA _yhG5VoaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG5VoaBEeaVYIZzHZR7BA" visibility="public" type="_yhG5RIaBEeaVYIZzHZR7BA" association="_yhG5VYaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG5V4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5WIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5WYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLoqIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLoqYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5WoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5W4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQLoqoWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG5XIaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:InformationItem" xmi:id="_yQLoq4WzEeaFx5FBVhZ7AQ" name="Generic Domain Package">
-          <eAnnotations xmi:id="_yQLorIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQLorYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLoroWzEeaFx5FBVhZ7AQ" value="0"/>
-            </contents>
-          </eAnnotations>
-        </packagedElement>
       </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_yQLor4WzEeaFx5FBVhZ7AQ" name="spatial">
-        <eAnnotations xmi:id="_yQLosIWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQLosYWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLosoWzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Package" xmi:id="_yhG5XYaBEeaVYIZzHZR7BA" name="spatial">
+        <eAnnotations xmi:id="_yhG5XoaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG5X4aBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5YIaBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQLos4WzEeaFx5FBVhZ7AQ" memberEnd="_yQIljYWzEeaFx5FBVhZ7AQ _yQLotIWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQLotIWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQIliIWzEeaFx5FBVhZ7AQ" association="_yQLos4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQLotYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLotoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLot4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG5YYaBEeaVYIZzHZR7BA" memberEnd="_yhG3Y4aBEeaVYIZzHZR7BA _yhG5YoaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG5YoaBEeaVYIZzHZR7BA" visibility="public" type="_yhG3XoaBEeaVYIZzHZR7BA" association="_yhG5YYaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG5Y4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5ZIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5ZYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLouIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLouYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5ZoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5Z4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQLouoWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG5aIaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQLou4WzEeaFx5FBVhZ7AQ" name="SpaceBasis" isAbstract="true">
-          <eAnnotations xmi:id="_yQLovIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQLovYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLovoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG5aYaBEeaVYIZzHZR7BA" name="SpaceBasis" isAbstract="true">
+          <eAnnotations xmi:id="_yhG5aoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG5a4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5bIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQLov4WzEeaFx5FBVhZ7AQ" name="StdSpaceBasis">
-          <eAnnotations xmi:id="_yQLowIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQLowYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLowoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG5bYaBEeaVYIZzHZR7BA" name="StdSpaceBasis">
+          <eAnnotations xmi:id="_yhG5boaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG5b4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5cIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQLow4WzEeaFx5FBVhZ7AQ" general="_yQLou4WzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLoxIWzEeaFx5FBVhZ7AQ" name="origin" visibility="public" type="_yQQhQ4WzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQLoxYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLoxoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLox4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG5cYaBEeaVYIZzHZR7BA" general="_yhG5aYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5coaBEeaVYIZzHZR7BA" name="origin" visibility="public" type="_yhG8noaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG5c4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5dIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5dYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLoyIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLoyYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5doaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5d4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLoyoWzEeaFx5FBVhZ7AQ" name="orientation" visibility="public" type="_yQQhXYWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQLoy4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLozIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLozYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5eIaBEeaVYIZzHZR7BA" name="orientation" visibility="public" type="_yhG8uIaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG5eYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5eoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5e4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLozoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLoz4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5fIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5fYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLo0IWzEeaFx5FBVhZ7AQ" name="equinox" visibility="public" type="_yQRIEoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQLo0YWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLo0oWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLo04WzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5foaBEeaVYIZzHZR7BA" name="equinox" visibility="public" type="_yhG8b4aBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG5f4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5gIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5gYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLo1IWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLo1YWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5goaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5g4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQLo1oWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG5hIaBEeaVYIZzHZR7BA"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQLo14WzEeaFx5FBVhZ7AQ" name="CustomSpaceBasis">
-          <eAnnotations xmi:id="_yQLo2IWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQLo2YWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLo2oWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG5hYaBEeaVYIZzHZR7BA" name="CustomSpaceBasis">
+          <eAnnotations xmi:id="_yhG5hoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG5h4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5iIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQLo24WzEeaFx5FBVhZ7AQ" general="_yQLou4WzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLo3IWzEeaFx5FBVhZ7AQ" name="basis" visibility="public" type="_yQLou4WzEeaFx5FBVhZ7AQ" association="_yQMPgYWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQLo3YWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLo3oWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLo34WzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG5iYaBEeaVYIZzHZR7BA" general="_yhG5aYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5ioaBEeaVYIZzHZR7BA" name="basis" visibility="public" type="_yhG5aYaBEeaVYIZzHZR7BA" association="_yhG5loaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG5i4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5jIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5jYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLo4IWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLo4YWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5joaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5j4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQLo4oWzEeaFx5FBVhZ7AQ" name="origin" visibility="public" type="_yQOry4WzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQLo44WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQLo5IWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQLo5YWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5kIaBEeaVYIZzHZR7BA" name="origin" visibility="public" type="_yhG62IaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG5kYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5koaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5k4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQLo5oWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPgIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5lIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5lYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQMPgYWzEeaFx5FBVhZ7AQ" memberEnd="_yQLo3IWzEeaFx5FBVhZ7AQ _yQMPgoWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQMPgoWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQLo14WzEeaFx5FBVhZ7AQ" association="_yQMPgYWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQMPg4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQMPhIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPhYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG5loaBEeaVYIZzHZR7BA" memberEnd="_yhG5ioaBEeaVYIZzHZR7BA _yhG5l4aBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG5l4aBEeaVYIZzHZR7BA" visibility="public" type="_yhG5hYaBEeaVYIZzHZR7BA" association="_yhG5loaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG5mIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5mYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5moaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQMPhoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPh4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5m4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5nIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQMPiIWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG5nYaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQMPiYWzEeaFx5FBVhZ7AQ" name="CoordSpace" isAbstract="true">
-          <eAnnotations xmi:id="_yQMPioWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQMPi4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPjIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG5noaBEeaVYIZzHZR7BA" name="CoordSpace" isAbstract="true">
+          <eAnnotations xmi:id="_yhG5n4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG5oIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5oYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQMPjYWzEeaFx5FBVhZ7AQ" name="axis" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQMPlIWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQMPjoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQMPj4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPkIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5ooaBEeaVYIZzHZR7BA" name="axis" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG5qYaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG5o4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5pIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5pYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQMPkYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPkoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5poaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5p4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQMPk4WzEeaFx5FBVhZ7AQ" value="*"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG5qIaBEeaVYIZzHZR7BA" value="*"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQMPlIWzEeaFx5FBVhZ7AQ" memberEnd="_yQMPjYWzEeaFx5FBVhZ7AQ _yQMPlYWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQMPlYWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQMPiYWzEeaFx5FBVhZ7AQ" association="_yQMPlIWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQMPloWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQMPl4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPmIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG5qYaBEeaVYIZzHZR7BA" memberEnd="_yhG5ooaBEeaVYIZzHZR7BA _yhG5qoaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG5qoaBEeaVYIZzHZR7BA" visibility="public" type="_yhG5noaBEeaVYIZzHZR7BA" association="_yhG5qYaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG5q4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5rIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5rYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQMPmYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPmoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5roaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5r4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQMPm4WzEeaFx5FBVhZ7AQ" name="Spherical">
-          <eAnnotations xmi:id="_yQMPnIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQMPnYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPnoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG5sIaBEeaVYIZzHZR7BA" name="Spherical">
+          <eAnnotations xmi:id="_yhG5sYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG5soaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5s4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQMPn4WzEeaFx5FBVhZ7AQ" general="_yQMPiYWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQMPoIWzEeaFx5FBVhZ7AQ" name="r" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" association="_yQMPsoWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQMPoYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQMPooWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPo4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG5tIaBEeaVYIZzHZR7BA" general="_yhG5noaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5tYaBEeaVYIZzHZR7BA" name="r" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" association="_yhG5x4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG5toaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5t4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5uIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQMPpIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPpYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5uYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5uoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQMPpoWzEeaFx5FBVhZ7AQ" name="theta" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" association="_yQMPuoWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQMPp4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQMPqIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPqYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5u4aBEeaVYIZzHZR7BA" name="theta" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" association="_yhG5z4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG5vIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5vYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5voaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQMPqoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPq4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5v4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5wIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQMPrIWzEeaFx5FBVhZ7AQ" name="phi" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" association="_yQMPwoWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQMPrYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQMProWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPr4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG5wYaBEeaVYIZzHZR7BA" name="phi" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" association="_yhG514aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG5woaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5w4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5xIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQMPsIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPsYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5xYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5xoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQMPsoWzEeaFx5FBVhZ7AQ" memberEnd="_yQMPoIWzEeaFx5FBVhZ7AQ _yQMPs4WzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQMPs4WzEeaFx5FBVhZ7AQ" visibility="public" type="_yQMPm4WzEeaFx5FBVhZ7AQ" association="_yQMPsoWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQMPtIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQMPtYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPtoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG5x4aBEeaVYIZzHZR7BA" memberEnd="_yhG5tYaBEeaVYIZzHZR7BA _yhG5yIaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG5yIaBEeaVYIZzHZR7BA" visibility="public" type="_yhG5sIaBEeaVYIZzHZR7BA" association="_yhG5x4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG5yYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5yoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5y4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQMPt4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPuIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5zIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5zYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQMPuYWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG5zoaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQMPuoWzEeaFx5FBVhZ7AQ" memberEnd="_yQMPpoWzEeaFx5FBVhZ7AQ _yQMPu4WzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQMPu4WzEeaFx5FBVhZ7AQ" visibility="public" type="_yQMPm4WzEeaFx5FBVhZ7AQ" association="_yQMPuoWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQMPvIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQMPvYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPvoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG5z4aBEeaVYIZzHZR7BA" memberEnd="_yhG5u4aBEeaVYIZzHZR7BA _yhG50IaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG50IaBEeaVYIZzHZR7BA" visibility="public" type="_yhG5sIaBEeaVYIZzHZR7BA" association="_yhG5z4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG50YaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG50oaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG504aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQMPv4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPwIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG51IaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG51YaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQMPwYWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG51oaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQMPwoWzEeaFx5FBVhZ7AQ" memberEnd="_yQMPrIWzEeaFx5FBVhZ7AQ _yQMPw4WzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQMPw4WzEeaFx5FBVhZ7AQ" visibility="public" type="_yQMPm4WzEeaFx5FBVhZ7AQ" association="_yQMPwoWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQMPxIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQMPxYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPxoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG514aBEeaVYIZzHZR7BA" memberEnd="_yhG5wYaBEeaVYIZzHZR7BA _yhG52IaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG52IaBEeaVYIZzHZR7BA" visibility="public" type="_yhG5sIaBEeaVYIZzHZR7BA" association="_yhG514aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG52YaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG52oaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG524aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQMPx4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPyIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG53IaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG53YaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQMPyYWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG53oaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQMPyoWzEeaFx5FBVhZ7AQ" name="Polar">
-          <eAnnotations xmi:id="_yQMPy4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQMPzIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMPzYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG534aBEeaVYIZzHZR7BA" name="Polar">
+          <eAnnotations xmi:id="_yhG54IaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG54YaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG54oaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQMPzoWzEeaFx5FBVhZ7AQ" general="_yQMPiYWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQMPz4WzEeaFx5FBVhZ7AQ" name="theta" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" association="_yQMP24WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQMP0IWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQMP0YWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMP0oWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG544aBEeaVYIZzHZR7BA" general="_yhG5noaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG55IaBEeaVYIZzHZR7BA" name="theta" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" association="_yhG58IaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG55YaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG55oaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG554aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQMP04WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMP1IWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG56IaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG56YaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQMP1YWzEeaFx5FBVhZ7AQ" name="r" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" association="_yQMP44WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQMP1oWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQMP14WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMP2IWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG56oaBEeaVYIZzHZR7BA" name="r" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" association="_yhG5-IaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG564aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG57IaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG57YaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQMP2YWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMP2oWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG57oaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG574aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQMP24WzEeaFx5FBVhZ7AQ" memberEnd="_yQMPz4WzEeaFx5FBVhZ7AQ _yQMP3IWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQMP3IWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQMPyoWzEeaFx5FBVhZ7AQ" association="_yQMP24WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQMP3YWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQMP3oWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMP34WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG58IaBEeaVYIZzHZR7BA" memberEnd="_yhG55IaBEeaVYIZzHZR7BA _yhG58YaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG58YaBEeaVYIZzHZR7BA" visibility="public" type="_yhG534aBEeaVYIZzHZR7BA" association="_yhG58IaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG58oaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG584aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG59IaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQMP4IWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMP4YWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG59YaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG59oaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQMP4oWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG594aBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQMP44WzEeaFx5FBVhZ7AQ" memberEnd="_yQMP1YWzEeaFx5FBVhZ7AQ _yQMP5IWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQMP5IWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQMPyoWzEeaFx5FBVhZ7AQ" association="_yQMP44WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQMP5YWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQMP5oWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMP54WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG5-IaBEeaVYIZzHZR7BA" memberEnd="_yhG56oaBEeaVYIZzHZR7BA _yhG5-YaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG5-YaBEeaVYIZzHZR7BA" visibility="public" type="_yhG534aBEeaVYIZzHZR7BA" association="_yhG5-IaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG5-oaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG5-4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5_IaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQMP6IWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMP6YWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG5_YaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG5_oaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQMP6oWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG5_4aBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQMP64WzEeaFx5FBVhZ7AQ" name="Cylindrical">
-          <eAnnotations xmi:id="_yQMP7IWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQMP7YWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMP7oWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG6AIaBEeaVYIZzHZR7BA" name="Cylindrical">
+          <eAnnotations xmi:id="_yhG6AYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG6AoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6A4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQMP74WzEeaFx5FBVhZ7AQ" general="_yQMPiYWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQMP8IWzEeaFx5FBVhZ7AQ" name="r" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" association="_yQM2l4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQMP8YWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQMP8oWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMP84WzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG6BIaBEeaVYIZzHZR7BA" general="_yhG5noaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG6BYaBEeaVYIZzHZR7BA" name="r" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" association="_yhG6F4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6BoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6B4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6CIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQMP9IWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMP9YWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6CYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6CoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQMP9oWzEeaFx5FBVhZ7AQ" name="theta" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" association="_yQM2n4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQMP94WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQMP-IWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQMP-YWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG6C4aBEeaVYIZzHZR7BA" name="theta" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" association="_yhG6H4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6DIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6DYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6DoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQMP-oWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2kIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6D4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6EIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQM2kYWzEeaFx5FBVhZ7AQ" name="z" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" association="_yQM2p4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQM2koWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQM2k4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2lIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG6EYaBEeaVYIZzHZR7BA" name="z" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" association="_yhG6J4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6EoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6E4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6FIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQM2lYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2loWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6FYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6FoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQM2l4WzEeaFx5FBVhZ7AQ" memberEnd="_yQMP8IWzEeaFx5FBVhZ7AQ _yQM2mIWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQM2mIWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQMP64WzEeaFx5FBVhZ7AQ" association="_yQM2l4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQM2mYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQM2moWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2m4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG6F4aBEeaVYIZzHZR7BA" memberEnd="_yhG6BYaBEeaVYIZzHZR7BA _yhG6GIaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG6GIaBEeaVYIZzHZR7BA" visibility="public" type="_yhG6AIaBEeaVYIZzHZR7BA" association="_yhG6F4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6GYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6GoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6G4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQM2nIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2nYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6HIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6HYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQM2noWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG6HoaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQM2n4WzEeaFx5FBVhZ7AQ" memberEnd="_yQMP9oWzEeaFx5FBVhZ7AQ _yQM2oIWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQM2oIWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQMP64WzEeaFx5FBVhZ7AQ" association="_yQM2n4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQM2oYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQM2ooWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2o4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG6H4aBEeaVYIZzHZR7BA" memberEnd="_yhG6C4aBEeaVYIZzHZR7BA _yhG6IIaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG6IIaBEeaVYIZzHZR7BA" visibility="public" type="_yhG6AIaBEeaVYIZzHZR7BA" association="_yhG6H4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6IYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6IoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6I4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQM2pIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2pYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6JIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6JYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQM2poWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG6JoaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQM2p4WzEeaFx5FBVhZ7AQ" memberEnd="_yQM2kYWzEeaFx5FBVhZ7AQ _yQM2qIWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQM2qIWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQMP64WzEeaFx5FBVhZ7AQ" association="_yQM2p4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQM2qYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQM2qoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2q4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG6J4aBEeaVYIZzHZR7BA" memberEnd="_yhG6EYaBEeaVYIZzHZR7BA _yhG6KIaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG6KIaBEeaVYIZzHZR7BA" visibility="public" type="_yhG6AIaBEeaVYIZzHZR7BA" association="_yhG6J4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6KYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6KoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6K4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQM2rIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2rYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6LIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6LYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQM2roWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG6LoaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQM2r4WzEeaFx5FBVhZ7AQ" name="Cartesian">
-          <eAnnotations xmi:id="_yQM2sIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQM2sYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2soWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG6L4aBEeaVYIZzHZR7BA" name="Cartesian">
+          <eAnnotations xmi:id="_yhG6MIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG6MYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6MoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQM2s4WzEeaFx5FBVhZ7AQ" general="_yQMPiYWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQM2tIWzEeaFx5FBVhZ7AQ" name="x" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" association="_yQM2xoWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQM2tYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQM2toWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2t4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG6M4aBEeaVYIZzHZR7BA" general="_yhG5noaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG6NIaBEeaVYIZzHZR7BA" name="x" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" association="_yhG6RoaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6NYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6NoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6N4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQM2uIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2uYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6OIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6OYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQM2uoWzEeaFx5FBVhZ7AQ" name="y" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" association="_yQM2zoWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQM2u4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQM2vIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2vYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG6OoaBEeaVYIZzHZR7BA" name="y" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" association="_yhG6ToaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6O4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6PIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6PYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQM2voWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2v4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6PoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6P4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQM2wIWzEeaFx5FBVhZ7AQ" name="z" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" association="_yQM21oWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQM2wYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQM2woWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2w4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG6QIaBEeaVYIZzHZR7BA" name="z" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" association="_yhG6VoaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6QYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6QoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6Q4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQM2xIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2xYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6RIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6RYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQM2xoWzEeaFx5FBVhZ7AQ" memberEnd="_yQM2tIWzEeaFx5FBVhZ7AQ _yQM2x4WzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQM2x4WzEeaFx5FBVhZ7AQ" visibility="public" type="_yQM2r4WzEeaFx5FBVhZ7AQ" association="_yQM2xoWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQM2yIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQM2yYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2yoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG6RoaBEeaVYIZzHZR7BA" memberEnd="_yhG6NIaBEeaVYIZzHZR7BA _yhG6R4aBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG6R4aBEeaVYIZzHZR7BA" visibility="public" type="_yhG6L4aBEeaVYIZzHZR7BA" association="_yhG6RoaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6SIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6SYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6SoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQM2y4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM2zIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6S4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6TIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQM2zYWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG6TYaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQM2zoWzEeaFx5FBVhZ7AQ" memberEnd="_yQM2uoWzEeaFx5FBVhZ7AQ _yQM2z4WzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQM2z4WzEeaFx5FBVhZ7AQ" visibility="public" type="_yQM2r4WzEeaFx5FBVhZ7AQ" association="_yQM2zoWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQM20IWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQM20YWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM20oWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG6ToaBEeaVYIZzHZR7BA" memberEnd="_yhG6OoaBEeaVYIZzHZR7BA _yhG6T4aBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG6T4aBEeaVYIZzHZR7BA" visibility="public" type="_yhG6L4aBEeaVYIZzHZR7BA" association="_yhG6ToaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6UIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6UYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6UoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQM204WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM21IWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6U4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6VIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQM21YWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG6VYaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQM21oWzEeaFx5FBVhZ7AQ" memberEnd="_yQM2wIWzEeaFx5FBVhZ7AQ _yQM214WzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQM214WzEeaFx5FBVhZ7AQ" visibility="public" type="_yQM2r4WzEeaFx5FBVhZ7AQ" association="_yQM21oWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQM22IWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQM22YWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM22oWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG6VoaBEeaVYIZzHZR7BA" memberEnd="_yhG6QIaBEeaVYIZzHZR7BA _yhG6V4aBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG6V4aBEeaVYIZzHZR7BA" visibility="public" type="_yhG6L4aBEeaVYIZzHZR7BA" association="_yhG6VoaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6WIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6WYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6WoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQM224WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM23IWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6W4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6XIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQM23YWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG6XYaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQM23oWzEeaFx5FBVhZ7AQ" name="UnitSphere">
-          <eAnnotations xmi:id="_yQM234WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQM24IWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM24YWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG6XoaBEeaVYIZzHZR7BA" name="UnitSphere">
+          <eAnnotations xmi:id="_yhG6X4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG6YIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6YYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQM24oWzEeaFx5FBVhZ7AQ" general="_yQMPiYWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQM244WzEeaFx5FBVhZ7AQ" name="x" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" association="_yQM274WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQM25IWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQM25YWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM25oWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG6YoaBEeaVYIZzHZR7BA" general="_yhG5noaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG6Y4aBEeaVYIZzHZR7BA" name="x" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" association="_yhG6b4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6ZIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6ZYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6ZoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQM254WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM26IWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6Z4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6aIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQM26YWzEeaFx5FBVhZ7AQ" name="y" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" association="_yQM294WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQM26oWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQM264WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM27IWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG6aYaBEeaVYIZzHZR7BA" name="y" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" association="_yhG6d4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6aoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6a4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6bIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQM27YWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM27oWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6bYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6boaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQM274WzEeaFx5FBVhZ7AQ" memberEnd="_yQM244WzEeaFx5FBVhZ7AQ _yQM28IWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQM28IWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQM23oWzEeaFx5FBVhZ7AQ" association="_yQM274WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQM28YWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQM28oWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM284WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG6b4aBEeaVYIZzHZR7BA" memberEnd="_yhG6Y4aBEeaVYIZzHZR7BA _yhG6cIaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG6cIaBEeaVYIZzHZR7BA" visibility="public" type="_yhG6XoaBEeaVYIZzHZR7BA" association="_yhG6b4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6cYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6coaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6c4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQM29IWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQM29YWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6dIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6dYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQM29oWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG6doaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQM294WzEeaFx5FBVhZ7AQ" memberEnd="_yQM26YWzEeaFx5FBVhZ7AQ _yQM2-IWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQM2-IWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQM23oWzEeaFx5FBVhZ7AQ" association="_yQM294WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQNdoIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQNdoYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQNdooWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG6d4aBEeaVYIZzHZR7BA" memberEnd="_yhG6aYaBEeaVYIZzHZR7BA _yhG6eIaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG6eIaBEeaVYIZzHZR7BA" visibility="public" type="_yhG6XoaBEeaVYIZzHZR7BA" association="_yhG6d4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6eYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6eoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6e4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQNdo4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQNdpIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6fIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6fYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQNdpYWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG6foaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQNdpoWzEeaFx5FBVhZ7AQ" name="HealPix">
-          <eAnnotations xmi:id="_yQNdp4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQNdqIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQNdqYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG6f4aBEeaVYIZzHZR7BA" name="HealPix">
+          <eAnnotations xmi:id="_yhG6gIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG6gYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6goaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQNdqoWzEeaFx5FBVhZ7AQ" general="_yQMPiYWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQNdq4WzEeaFx5FBVhZ7AQ" name="Ntheta" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" association="_yQNdvYWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQNdrIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQNdrYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQNdroWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG6g4aBEeaVYIZzHZR7BA" general="_yhG5noaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG6hIaBEeaVYIZzHZR7BA" name="Ntheta" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" association="_yhG6loaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6hYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6hoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6h4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQNdr4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQNdsIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6iIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6iYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQNdsYWzEeaFx5FBVhZ7AQ" name="Nphi" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" association="_yQNdxYWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQNdsoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQNds4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQNdtIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG6ioaBEeaVYIZzHZR7BA" name="Nphi" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" association="_yhG6noaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6i4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6jIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6jYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQNdtYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQNdtoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6joaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6j4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQNdt4WzEeaFx5FBVhZ7AQ" name="scheme" visibility="public" type="_yQFh6YWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQNduIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQNduYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQNduoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG6kIaBEeaVYIZzHZR7BA" name="scheme" visibility="public" type="_yhG0_YaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG6kYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6koaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6k4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQNdu4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQNdvIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6lIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6lYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQNdvYWzEeaFx5FBVhZ7AQ" memberEnd="_yQNdq4WzEeaFx5FBVhZ7AQ _yQNdvoWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQNdvoWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQNdpoWzEeaFx5FBVhZ7AQ" association="_yQNdvYWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQNdv4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQNdwIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQNdwYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG6loaBEeaVYIZzHZR7BA" memberEnd="_yhG6hIaBEeaVYIZzHZR7BA _yhG6l4aBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG6l4aBEeaVYIZzHZR7BA" visibility="public" type="_yhG6f4aBEeaVYIZzHZR7BA" association="_yhG6loaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6mIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6mYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6moaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQNdwoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQNdw4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6m4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6nIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQNdxIWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG6nYaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQNdxYWzEeaFx5FBVhZ7AQ" memberEnd="_yQNdsYWzEeaFx5FBVhZ7AQ _yQOEsIWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQOEsIWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQNdpoWzEeaFx5FBVhZ7AQ" association="_yQNdxYWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQOEsYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQOEsoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOEs4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG6noaBEeaVYIZzHZR7BA" memberEnd="_yhG6ioaBEeaVYIZzHZR7BA _yhG6n4aBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG6n4aBEeaVYIZzHZR7BA" visibility="public" type="_yhG6f4aBEeaVYIZzHZR7BA" association="_yhG6noaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6oIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6oYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6ooaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQOEtIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOEtYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6o4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6pIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQOEtoWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG6pYaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQOEt4WzEeaFx5FBVhZ7AQ" name="SpaceFrame">
-          <eAnnotations xmi:id="_yQOEuIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQOEuYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOEuoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG6poaBEeaVYIZzHZR7BA" name="SpaceFrame">
+          <eAnnotations xmi:id="_yhG6p4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG6qIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6qYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQOEu4WzEeaFx5FBVhZ7AQ" general="_yQJMTIWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQOEvIWzEeaFx5FBVhZ7AQ" name="basis" visibility="public" type="_yQLou4WzEeaFx5FBVhZ7AQ" association="_yQOEyIWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQOEvYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQOEvoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOEv4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG6qoaBEeaVYIZzHZR7BA" general="_yhG3jYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG6q4aBEeaVYIZzHZR7BA" name="basis" visibility="public" type="_yhG5aYaBEeaVYIZzHZR7BA" association="_yhG6t4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6rIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6rYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6roaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQOEwIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOEwYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6r4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6sIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQOEwoWzEeaFx5FBVhZ7AQ" name="coordSpace" visibility="public" type="_yQMPiYWzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQOE0IWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQOEw4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQOExIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOExYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG6sYaBEeaVYIZzHZR7BA" name="coordSpace" visibility="public" type="_yhG5noaBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG6v4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6soaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6s4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6tIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQOExoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOEx4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6tYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6toaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQOEyIWzEeaFx5FBVhZ7AQ" memberEnd="_yQOEvIWzEeaFx5FBVhZ7AQ _yQOEyYWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQOEyYWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQOEt4WzEeaFx5FBVhZ7AQ" association="_yQOEyIWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQOEyoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQOEy4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOEzIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG6t4aBEeaVYIZzHZR7BA" memberEnd="_yhG6q4aBEeaVYIZzHZR7BA _yhG6uIaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG6uIaBEeaVYIZzHZR7BA" visibility="public" type="_yhG6poaBEeaVYIZzHZR7BA" association="_yhG6t4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6uYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6uoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6u4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQOEzYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOEzoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6vIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6vYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQOEz4WzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG6voaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQOE0IWzEeaFx5FBVhZ7AQ" memberEnd="_yQOEwoWzEeaFx5FBVhZ7AQ _yQOE0YWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQOE0YWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQOEt4WzEeaFx5FBVhZ7AQ" association="_yQOE0IWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQOE0oWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQOE04WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOE1IWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG6v4aBEeaVYIZzHZR7BA" memberEnd="_yhG6sYaBEeaVYIZzHZR7BA _yhG6wIaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG6wIaBEeaVYIZzHZR7BA" visibility="public" type="_yhG6poaBEeaVYIZzHZR7BA" association="_yhG6v4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG6wYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6woaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6w4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQOE1YWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOE1oWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6xIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6xYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQOE14WzEeaFx5FBVhZ7AQ" name="CoordAxis">
-          <eAnnotations xmi:id="_yQOE2IWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQOE2YWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOE2oWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG6xoaBEeaVYIZzHZR7BA" name="CoordAxis">
+          <eAnnotations xmi:id="_yhG6x4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG6yIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6yYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQOE24WzEeaFx5FBVhZ7AQ" name="domainMin" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQOE3IWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQOE3YWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOrwIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG6yoaBEeaVYIZzHZR7BA" name="domainMin" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG6y4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6zIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6zYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQOrwYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOrwoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6zoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6z4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQOrw4WzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG60IaBEeaVYIZzHZR7BA"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQOrxIWzEeaFx5FBVhZ7AQ" name="domainMax" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQOrxYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQOrxoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOrx4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG60YaBEeaVYIZzHZR7BA" name="domainMax" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG60oaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG604aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG61IaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQOryIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOryYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG61YaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG61oaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQOryoWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG614aBEeaVYIZzHZR7BA"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_yQOry4WzEeaFx5FBVhZ7AQ" name="SpatialCoord" isAbstract="true">
-          <eAnnotations xmi:id="_yQOrzIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQOrzYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOrzoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_yhG62IaBEeaVYIZzHZR7BA" name="SpatialCoord" isAbstract="true">
+          <eAnnotations xmi:id="_yhG62YaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG62oaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG624aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQOrz4WzEeaFx5FBVhZ7AQ" name="elem" visibility="public" type="_yQQhKoWzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQOr14WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQOr0IWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQOr0YWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOr0oWzEeaFx5FBVhZ7AQ" value="0"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_yhG63IaBEeaVYIZzHZR7BA" name="SpatialCoord1D">
+          <eAnnotations xmi:id="_yhG63YaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG63oaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG634aBEeaVYIZzHZR7BA" value="0"/>
+            </contents>
+          </eAnnotations>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG64IaBEeaVYIZzHZR7BA" general="_yhG62IaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG64YaBEeaVYIZzHZR7BA" name="elem" visibility="public" type="_yhG8hYaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG64oaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG644aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG65IaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQOr04WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOr1IWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG65YaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG65oaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQOr1YWzEeaFx5FBVhZ7AQ" value="*"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQOr1oWzEeaFx5FBVhZ7AQ"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQOr14WzEeaFx5FBVhZ7AQ" memberEnd="_yQOrz4WzEeaFx5FBVhZ7AQ _yQOr2IWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQOr2IWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQOry4WzEeaFx5FBVhZ7AQ" association="_yQOr14WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQOr2YWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQOr2oWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOr24WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_yhG654aBEeaVYIZzHZR7BA" name="SpatialCoord2D">
+          <eAnnotations xmi:id="_yhG66IaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG66YaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG66oaBEeaVYIZzHZR7BA" value="0"/>
+            </contents>
+          </eAnnotations>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG664aBEeaVYIZzHZR7BA" general="_yhG62IaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG67IaBEeaVYIZzHZR7BA" name="elem" visibility="public" type="_yhG8hYaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG67YaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG67oaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG674aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQOr3IWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOr3YWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG68IaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG68YaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-          </ownedEnd>
-        </packagedElement>
-        <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQOr3oWzEeaFx5FBVhZ7AQ" name="SpatialCoord1D">
-          <eAnnotations xmi:id="_yQOr34WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQOr4IWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOr4YWzEeaFx5FBVhZ7AQ" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQOr4oWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
-          </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQOr44WzEeaFx5FBVhZ7AQ" general="_yQOry4WzEeaFx5FBVhZ7AQ"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQOr5IWzEeaFx5FBVhZ7AQ" name="SpatialCoord2D">
-          <eAnnotations xmi:id="_yQOr5YWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQOr5oWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOr54WzEeaFx5FBVhZ7AQ" value="0"/>
-            </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQOr6IWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
-          </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQOr6YWzEeaFx5FBVhZ7AQ" general="_yQOry4WzEeaFx5FBVhZ7AQ"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG68oaBEeaVYIZzHZR7BA" value="2"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG684aBEeaVYIZzHZR7BA" value="2"/>
+          </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_yQOr6oWzEeaFx5FBVhZ7AQ" name="SpatialCoord3D">
-          <eAnnotations xmi:id="_yQOr64WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQOr7IWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOr7YWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_yhG69IaBEeaVYIZzHZR7BA" name="SpatialCoord3D">
+          <eAnnotations xmi:id="_yhG69YaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG69oaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG694aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
-            <contents xmi:type="uml:Property" xmi:id="_yQOr7oWzEeaFx5FBVhZ7AQ" name="isPrimitive"/>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQOr74WzEeaFx5FBVhZ7AQ" general="_yQOry4WzEeaFx5FBVhZ7AQ"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG6-IaBEeaVYIZzHZR7BA" general="_yhG62IaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG6-YaBEeaVYIZzHZR7BA" name="elem" visibility="public" type="_yhG8hYaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG6-oaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG6-4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6_IaBEeaVYIZzHZR7BA" value="0"/>
+              </contents>
+              <contents xmi:type="uml:Property" xmi:id="_yhG6_YaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG6_oaBEeaVYIZzHZR7BA" value="read_write"/>
+              </contents>
+            </eAnnotations>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG6_4aBEeaVYIZzHZR7BA" value="3"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG7AIaBEeaVYIZzHZR7BA" value="3"/>
+          </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:InformationItem" xmi:id="_yQOr8IWzEeaFx5FBVhZ7AQ" name="Spatial Domain Package">
-          <eAnnotations xmi:id="_yQOr8YWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQOr8oWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOr84WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:InformationItem" xmi:id="_yhG7AYaBEeaVYIZzHZR7BA" name="Spatial Domain Package">
+          <eAnnotations xmi:id="_yhG7AoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG7A4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7BIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQOr9IWzEeaFx5FBVhZ7AQ" name="Position" isAbstract="true">
-          <eAnnotations xmi:id="_yQOr9YWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQOr9oWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOr94WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG7BYaBEeaVYIZzHZR7BA" name="Position" isAbstract="true">
+          <eAnnotations xmi:id="_yhG7BoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG7B4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7CIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQOr-IWzEeaFx5FBVhZ7AQ" name="Position1D">
-          <eAnnotations xmi:id="_yQOr-YWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQOr-oWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOr-4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG7CYaBEeaVYIZzHZR7BA" name="Position1D">
+          <eAnnotations xmi:id="_yhG7CoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG7C4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7DIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQOr_IWzEeaFx5FBVhZ7AQ" general="_yQOr9IWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQOr_YWzEeaFx5FBVhZ7AQ" name="error" visibility="public" type="_yQPS4IWzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQOsC4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQOr_oWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQOr_4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOsAIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG7DYaBEeaVYIZzHZR7BA" general="_yhG7BYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7DoaBEeaVYIZzHZR7BA" name="error" visibility="public" type="_yhG7VoaBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG7HIaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG7D4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7EIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7EYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQOsAYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOsAoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7EoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7E4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQOsA4WzEeaFx5FBVhZ7AQ" value="*"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQOsBIWzEeaFx5FBVhZ7AQ"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG7FIaBEeaVYIZzHZR7BA" value="*"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG7FYaBEeaVYIZzHZR7BA"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQOsBYWzEeaFx5FBVhZ7AQ" name="coord" visibility="public" type="_yQOr3oWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQOsBoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQOsB4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOsCIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7FoaBEeaVYIZzHZR7BA" name="coord" visibility="public" type="_yhG63IaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7F4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7GIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7GYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQOsCYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOsCoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7GoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7G4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQOsC4WzEeaFx5FBVhZ7AQ" memberEnd="_yQOr_YWzEeaFx5FBVhZ7AQ _yQOsDIWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQOsDIWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQOr-IWzEeaFx5FBVhZ7AQ" association="_yQOsC4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQOsDYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQOsDoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOsD4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG7HIaBEeaVYIZzHZR7BA" memberEnd="_yhG7DoaBEeaVYIZzHZR7BA _yhG7HYaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG7HYaBEeaVYIZzHZR7BA" visibility="public" type="_yhG7CYaBEeaVYIZzHZR7BA" association="_yhG7HIaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG7HoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7H4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7IIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQOsEIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOsEYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7IYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7IoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQOsEoWzEeaFx5FBVhZ7AQ" name="Position2D">
-          <eAnnotations xmi:id="_yQOsE4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQOsFIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOsFYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG7I4aBEeaVYIZzHZR7BA" name="Position2D">
+          <eAnnotations xmi:id="_yhG7JIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG7JYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7JoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQOsFoWzEeaFx5FBVhZ7AQ" general="_yQOr9IWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQOsF4WzEeaFx5FBVhZ7AQ" name="error" visibility="public" type="_yQPTI4WzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQOsJYWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQOsGIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQOsGYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOsGoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG7J4aBEeaVYIZzHZR7BA" general="_yhG7BYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7KIaBEeaVYIZzHZR7BA" name="error" visibility="public" type="_yhG7mYaBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG7NoaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG7KYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7KoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7K4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQOsG4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOsHIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7LIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7LYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQOsHYWzEeaFx5FBVhZ7AQ" value="*"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQOsHoWzEeaFx5FBVhZ7AQ"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG7LoaBEeaVYIZzHZR7BA" value="*"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG7L4aBEeaVYIZzHZR7BA"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQOsH4WzEeaFx5FBVhZ7AQ" name="coord" visibility="public" type="_yQOr5IWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQOsIIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQOsIYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOsIoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7MIaBEeaVYIZzHZR7BA" name="coord" visibility="public" type="_yhG654aBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7MYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7MoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7M4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQOsI4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOsJIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7NIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7NYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQOsJYWzEeaFx5FBVhZ7AQ" memberEnd="_yQOsF4WzEeaFx5FBVhZ7AQ _yQOsJoWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQOsJoWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQOsEoWzEeaFx5FBVhZ7AQ" association="_yQOsJYWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQOsJ4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQOsKIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOsKYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG7NoaBEeaVYIZzHZR7BA" memberEnd="_yhG7KIaBEeaVYIZzHZR7BA _yhG7N4aBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG7N4aBEeaVYIZzHZR7BA" visibility="public" type="_yhG7I4aBEeaVYIZzHZR7BA" association="_yhG7NoaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG7OIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7OYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7OoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQOsKoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOsK4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7O4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7PIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQOsLIWzEeaFx5FBVhZ7AQ" name="Position3D">
-          <eAnnotations xmi:id="_yQOsLYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQOsLoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOsL4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG7PYaBEeaVYIZzHZR7BA" name="Position3D">
+          <eAnnotations xmi:id="_yhG7PoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG7P4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7QIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQOsMIWzEeaFx5FBVhZ7AQ" general="_yQOr9IWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQOsMYWzEeaFx5FBVhZ7AQ" name="error" visibility="public" type="_yQP6JIWzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQPS2YWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQOsMoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQOsM4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQOsNIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG7QYaBEeaVYIZzHZR7BA" general="_yhG7BYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7QoaBEeaVYIZzHZR7BA" name="error" visibility="public" type="_yhG8AIaBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG7T4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG7Q4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7RIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7RYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQPS0IWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPS0YWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7RoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7R4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQPS0oWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG7SIaBEeaVYIZzHZR7BA"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQPS04WzEeaFx5FBVhZ7AQ" name="coord" visibility="public" type="_yQOr6oWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQPS1IWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQPS1YWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPS1oWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7SYaBEeaVYIZzHZR7BA" name="coord" visibility="public" type="_yhG69IaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7SoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7S4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7TIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQPS14WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPS2IWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7TYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7ToaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQPS2YWzEeaFx5FBVhZ7AQ" memberEnd="_yQOsMYWzEeaFx5FBVhZ7AQ _yQPS2oWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQPS2oWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQOsLIWzEeaFx5FBVhZ7AQ" association="_yQPS2YWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQPS24WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQPS3IWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPS3YWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG7T4aBEeaVYIZzHZR7BA" memberEnd="_yhG7QoaBEeaVYIZzHZR7BA _yhG7UIaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG7UIaBEeaVYIZzHZR7BA" visibility="public" type="_yhG7PYaBEeaVYIZzHZR7BA" association="_yhG7T4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG7UYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7UoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7U4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQPS3oWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPS34WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7VIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7VYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQPS4IWzEeaFx5FBVhZ7AQ" name="Uncertainty1D" isAbstract="true">
-          <eAnnotations xmi:id="_yQPS4YWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQPS4oWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPS44WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG7VoaBEeaVYIZzHZR7BA" name="Uncertainty1D" isAbstract="true">
+          <eAnnotations xmi:id="_yhG7V4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG7WIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7WYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQPS5IWzEeaFx5FBVhZ7AQ" name="flavor" visibility="public" type="_yQFh6YWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQPS5YWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQPS5oWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPS54WzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7WoaBEeaVYIZzHZR7BA" name="flavor" visibility="public" type="_yhG0_YaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7W4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7XIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7XYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQPS6IWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPS6YWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7XoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7X4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQPS6oWzEeaFx5FBVhZ7AQ" name="Bounds1D">
-          <eAnnotations xmi:id="_yQPS64WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQPS7IWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPS7YWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG7YIaBEeaVYIZzHZR7BA" name="Bounds1D">
+          <eAnnotations xmi:id="_yhG7YYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG7YoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7Y4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQPS7oWzEeaFx5FBVhZ7AQ" general="_yQPS4IWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQPS74WzEeaFx5FBVhZ7AQ" name="hiLimit" visibility="public" type="_yQOr3oWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQPS8IWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQPS8YWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPS8oWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG7ZIaBEeaVYIZzHZR7BA" general="_yhG7VoaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7ZYaBEeaVYIZzHZR7BA" name="hiLimit" visibility="public" type="_yhG63IaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7ZoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7Z4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7aIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQPS84WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPS9IWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7aYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7aoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQPS9YWzEeaFx5FBVhZ7AQ" name="loLimit" visibility="public" type="_yQOr3oWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQPS9oWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQPS94WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPS-IWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7a4aBEeaVYIZzHZR7BA" name="loLimit" visibility="public" type="_yhG63IaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7bIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7bYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7boaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQPS-YWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPS-oWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7b4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7cIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQPS-4WzEeaFx5FBVhZ7AQ" name="SymmetricInterval">
-          <eAnnotations xmi:id="_yQPS_IWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQPS_YWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPS_oWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG7cYaBEeaVYIZzHZR7BA" name="SymmetricInterval">
+          <eAnnotations xmi:id="_yhG7coaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG7c4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7dIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQPS_4WzEeaFx5FBVhZ7AQ" general="_yQPS4IWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQPTAIWzEeaFx5FBVhZ7AQ" name="center" visibility="public" type="_yQOr3oWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQPTAYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQPTAoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTA4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG7dYaBEeaVYIZzHZR7BA" general="_yhG7VoaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7doaBEeaVYIZzHZR7BA" name="center" visibility="public" type="_yhG63IaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7d4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7eIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7eYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQPTBIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTBYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7eoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7e4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQPTBoWzEeaFx5FBVhZ7AQ" name="size" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQPTB4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQPTCIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTCYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7fIaBEeaVYIZzHZR7BA" name="size" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7fYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7foaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7f4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQPTCoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTC4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7gIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7gYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQPTDIWzEeaFx5FBVhZ7AQ" name="AssymetricInterval">
-          <eAnnotations xmi:id="_yQPTDYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQPTDoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTD4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG7goaBEeaVYIZzHZR7BA" name="AssymetricInterval">
+          <eAnnotations xmi:id="_yhG7g4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG7hIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7hYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQPTEIWzEeaFx5FBVhZ7AQ" general="_yQPS4IWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQPTEYWzEeaFx5FBVhZ7AQ" name="center" visibility="public" type="_yQOr3oWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQPTEoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQPTE4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTFIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG7hoaBEeaVYIZzHZR7BA" general="_yhG7VoaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7h4aBEeaVYIZzHZR7BA" name="center" visibility="public" type="_yhG63IaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7iIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7iYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7ioaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQPTFYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTFoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7i4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7jIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQPTF4WzEeaFx5FBVhZ7AQ" name="plus" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQPTGIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQPTGYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTGoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7jYaBEeaVYIZzHZR7BA" name="plus" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7joaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7j4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7kIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQPTG4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTHIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7kYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7koaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQPTHYWzEeaFx5FBVhZ7AQ" name="minus" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQPTHoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQPTH4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTIIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7k4aBEeaVYIZzHZR7BA" name="minus" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7lIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7lYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7loaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQPTIYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTIoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7l4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7mIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQPTI4WzEeaFx5FBVhZ7AQ" name="Uncertainty2D" isAbstract="true">
-          <eAnnotations xmi:id="_yQPTJIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQPTJYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTJoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG7mYaBEeaVYIZzHZR7BA" name="Uncertainty2D" isAbstract="true">
+          <eAnnotations xmi:id="_yhG7moaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG7m4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7nIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQPTJ4WzEeaFx5FBVhZ7AQ" name="flavor" visibility="public" type="_yQFh6YWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQPTKIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQPTKYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTKoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7nYaBEeaVYIZzHZR7BA" name="flavor" visibility="public" type="_yhG0_YaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7noaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7n4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7oIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQPTK4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTLIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7oYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7ooaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQPTLYWzEeaFx5FBVhZ7AQ" name="Bounds2D">
-          <eAnnotations xmi:id="_yQPTLoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQPTL4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTMIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG7o4aBEeaVYIZzHZR7BA" name="Bounds2D">
+          <eAnnotations xmi:id="_yhG7pIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG7pYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7poaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQPTMYWzEeaFx5FBVhZ7AQ" general="_yQPTI4WzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQPTMoWzEeaFx5FBVhZ7AQ" name="hiLimit" visibility="public" type="_yQOr5IWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQPTM4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQPTNIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTNYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG7p4aBEeaVYIZzHZR7BA" general="_yhG7mYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7qIaBEeaVYIZzHZR7BA" name="hiLimit" visibility="public" type="_yhG654aBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7qYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7qoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7q4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQPTNoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTN4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7rIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7rYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQPTOIWzEeaFx5FBVhZ7AQ" name="loLimit" visibility="public" type="_yQOr5IWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQPTOYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQPTOoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTO4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7roaBEeaVYIZzHZR7BA" name="loLimit" visibility="public" type="_yhG654aBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7r4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7sIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7sYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQPTPIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTPYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7soaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7s4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQPTPoWzEeaFx5FBVhZ7AQ" name="Circle">
-          <eAnnotations xmi:id="_yQPTP4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQPTQIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQPTQYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG7tIaBEeaVYIZzHZR7BA" name="Circle">
+          <eAnnotations xmi:id="_yhG7tYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG7toaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7t4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQPTQoWzEeaFx5FBVhZ7AQ" general="_yQPTI4WzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQPTQ4WzEeaFx5FBVhZ7AQ" name="center" visibility="public" type="_yQOr5IWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQPTRIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQPTRYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP54IWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG7uIaBEeaVYIZzHZR7BA" general="_yhG7mYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7uYaBEeaVYIZzHZR7BA" name="center" visibility="public" type="_yhG654aBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7uoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7u4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7vIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQP54YWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP54oWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7vYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7voaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQP544WzEeaFx5FBVhZ7AQ" name="radius" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQP55IWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQP55YWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP55oWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7v4aBEeaVYIZzHZR7BA" name="radius" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7wIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7wYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7woaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQP554WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP56IWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7w4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7xIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQP56YWzEeaFx5FBVhZ7AQ" name="Rectangle">
-          <eAnnotations xmi:id="_yQP56oWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQP564WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP57IWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG7xYaBEeaVYIZzHZR7BA" name="Rectangle">
+          <eAnnotations xmi:id="_yhG7xoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG7x4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7yIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQP57YWzEeaFx5FBVhZ7AQ" general="_yQPTI4WzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQP57oWzEeaFx5FBVhZ7AQ" name="center" visibility="public" type="_yQOr5IWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQP574WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQP58IWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP58YWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG7yYaBEeaVYIZzHZR7BA" general="_yhG7mYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7yoaBEeaVYIZzHZR7BA" name="center" visibility="public" type="_yhG654aBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7y4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7zIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7zYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQP58oWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP584WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7zoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7z4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQP59IWzEeaFx5FBVhZ7AQ" name="length" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQP59YWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQP59oWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP594WzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG70IaBEeaVYIZzHZR7BA" name="length" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG70YaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG70oaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG704aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQP5-IWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP5-YWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG71IaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG71YaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQP5-oWzEeaFx5FBVhZ7AQ" name="width" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQP5-4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQP5_IWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP5_YWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG71oaBEeaVYIZzHZR7BA" name="width" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG714aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG72IaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG72YaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQP5_oWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP5_4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG72oaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG724aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQP6AIWzEeaFx5FBVhZ7AQ" name="Ellipse">
-          <eAnnotations xmi:id="_yQP6AYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQP6AoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6A4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG73IaBEeaVYIZzHZR7BA" name="Ellipse">
+          <eAnnotations xmi:id="_yhG73YaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG73oaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG734aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQP6BIWzEeaFx5FBVhZ7AQ" general="_yQPTI4WzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQP6BYWzEeaFx5FBVhZ7AQ" name="center" visibility="public" type="_yQOr5IWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQP6BoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQP6B4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6CIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG74IaBEeaVYIZzHZR7BA" general="_yhG7mYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG74YaBEeaVYIZzHZR7BA" name="center" visibility="public" type="_yhG654aBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG74oaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG744aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG75IaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQP6CYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6CoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG75YaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG75oaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQP6C4WzEeaFx5FBVhZ7AQ" name="semiAxes" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQP6DIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQP6DYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6DoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG754aBEeaVYIZzHZR7BA" name="semiAxes" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG76IaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG76YaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG76oaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQP6D4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6EIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG764aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG77IaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQP6EYWzEeaFx5FBVhZ7AQ" value="2"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQP6EoWzEeaFx5FBVhZ7AQ" value="2"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG77YaBEeaVYIZzHZR7BA" value="2"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG77oaBEeaVYIZzHZR7BA" value="2"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQP6E4WzEeaFx5FBVhZ7AQ" name="rotation" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQP6FIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQP6FYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6FoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG774aBEeaVYIZzHZR7BA" name="rotation" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG78IaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG78YaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG78oaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQP6F4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6GIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG784aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG79IaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQP6GYWzEeaFx5FBVhZ7AQ" name="ErrorMatrix2x2">
-          <eAnnotations xmi:id="_yQP6GoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQP6G4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6HIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG79YaBEeaVYIZzHZR7BA" name="ErrorMatrix2x2">
+          <eAnnotations xmi:id="_yhG79oaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG794aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7-IaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQP6HYWzEeaFx5FBVhZ7AQ" general="_yQPTI4WzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQP6HoWzEeaFx5FBVhZ7AQ" name="matrix" visibility="public" type="_yQGI44WzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQP6H4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQP6IIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6IYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG7-YaBEeaVYIZzHZR7BA" general="_yhG7mYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG7-oaBEeaVYIZzHZR7BA" name="matrix" visibility="public" type="_yhG1T4aBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG7-4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG7_IaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7_YaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQP6IoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6I4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG7_oaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG7_4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQP6JIWzEeaFx5FBVhZ7AQ" name="Uncertainty3D" isAbstract="true">
-          <eAnnotations xmi:id="_yQP6JYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQP6JoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6J4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG8AIaBEeaVYIZzHZR7BA" name="Uncertainty3D" isAbstract="true">
+          <eAnnotations xmi:id="_yhG8AYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG8AoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8A4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQP6KIWzEeaFx5FBVhZ7AQ" name="flavor" visibility="public" type="_yQFh6YWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQP6KYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQP6KoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6K4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8BIaBEeaVYIZzHZR7BA" name="flavor" visibility="public" type="_yhG0_YaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8BYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8BoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8B4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQP6LIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6LYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8CIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8CYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQP6LoWzEeaFx5FBVhZ7AQ" name="Bounds3D">
-          <eAnnotations xmi:id="_yQP6L4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQP6MIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6MYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG8CoaBEeaVYIZzHZR7BA" name="Bounds3D">
+          <eAnnotations xmi:id="_yhG8C4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG8DIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8DYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQP6MoWzEeaFx5FBVhZ7AQ" general="_yQP6JIWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQP6M4WzEeaFx5FBVhZ7AQ" name="hiLimit" visibility="public" type="_yQOr6oWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQP6NIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQP6NYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6NoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG8DoaBEeaVYIZzHZR7BA" general="_yhG8AIaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8D4aBEeaVYIZzHZR7BA" name="hiLimit" visibility="public" type="_yhG69IaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8EIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8EYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8EoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQP6N4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6OIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8E4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8FIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQP6OYWzEeaFx5FBVhZ7AQ" name="loLimit" visibility="public" type="_yQOr6oWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQP6OoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQP6O4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6PIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8FYaBEeaVYIZzHZR7BA" name="loLimit" visibility="public" type="_yhG69IaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8FoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8F4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8GIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQP6PYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6PoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8GYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8GoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQP6P4WzEeaFx5FBVhZ7AQ" name="Sphere">
-          <eAnnotations xmi:id="_yQP6QIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQP6QYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6QoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG8G4aBEeaVYIZzHZR7BA" name="Sphere">
+          <eAnnotations xmi:id="_yhG8HIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG8HYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8HoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQP6Q4WzEeaFx5FBVhZ7AQ" general="_yQP6JIWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQP6RIWzEeaFx5FBVhZ7AQ" name="center" visibility="public" type="_yQOr6oWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQP6RYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQP6RoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6R4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG8H4aBEeaVYIZzHZR7BA" general="_yhG8AIaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8IIaBEeaVYIZzHZR7BA" name="center" visibility="public" type="_yhG69IaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8IYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8IoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8I4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQP6SIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6SYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8JIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8JYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQP6SoWzEeaFx5FBVhZ7AQ" name="radius" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQP6S4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQP6TIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6TYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8JoaBEeaVYIZzHZR7BA" name="radius" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8J4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8KIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8KYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQP6ToWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6T4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8KoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8K4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQP6UIWzEeaFx5FBVhZ7AQ" name="Cube">
-          <eAnnotations xmi:id="_yQP6UYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQP6UoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6U4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG8LIaBEeaVYIZzHZR7BA" name="Cube">
+          <eAnnotations xmi:id="_yhG8LYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG8LoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8L4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQP6VIWzEeaFx5FBVhZ7AQ" general="_yQP6JIWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQP6VYWzEeaFx5FBVhZ7AQ" name="center" visibility="public" type="_yQOr6oWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQP6VoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQP6V4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQP6WIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG8MIaBEeaVYIZzHZR7BA" general="_yhG8AIaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8MYaBEeaVYIZzHZR7BA" name="center" visibility="public" type="_yhG69IaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8MoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8M4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8NIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQQg8IWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQg8YWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8NYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8NoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQQg8oWzEeaFx5FBVhZ7AQ" name="length" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQQg84WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQQg9IWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQg9YWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8N4aBEeaVYIZzHZR7BA" name="length" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8OIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8OYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8OoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQQg9oWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQg94WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8O4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8PIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQQg-IWzEeaFx5FBVhZ7AQ" name="width" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQQg-YWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQQg-oWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQg-4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8PYaBEeaVYIZzHZR7BA" name="width" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8PoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8P4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8QIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQQg_IWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQg_YWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8QYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8QoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQQg_oWzEeaFx5FBVhZ7AQ" name="height" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQQg_4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQQhAIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhAYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8Q4aBEeaVYIZzHZR7BA" name="height" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8RIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8RYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8RoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQQhAoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhA4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8R4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8SIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQQhBIWzEeaFx5FBVhZ7AQ" name="Ellipsoid">
-          <eAnnotations xmi:id="_yQQhBYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQQhBoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhB4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG8SYaBEeaVYIZzHZR7BA" name="Ellipsoid">
+          <eAnnotations xmi:id="_yhG8SoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG8S4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8TIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQQhCIWzEeaFx5FBVhZ7AQ" general="_yQP6JIWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQQhCYWzEeaFx5FBVhZ7AQ" name="center" visibility="public" type="_yQOr6oWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQQhCoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQQhC4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhDIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG8TYaBEeaVYIZzHZR7BA" general="_yhG8AIaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8ToaBEeaVYIZzHZR7BA" name="center" visibility="public" type="_yhG69IaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8T4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8UIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8UYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQQhDYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhDoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8UoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8U4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQQhD4WzEeaFx5FBVhZ7AQ" name="semiAxes" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQQhEIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQQhEYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhEoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8VIaBEeaVYIZzHZR7BA" name="semiAxes" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8VYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8VoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8V4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQQhE4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhFIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8WIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8WYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQQhFYWzEeaFx5FBVhZ7AQ" value="3"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQQhFoWzEeaFx5FBVhZ7AQ" value="3"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG8WoaBEeaVYIZzHZR7BA" value="3"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG8W4aBEeaVYIZzHZR7BA" value="3"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQQhF4WzEeaFx5FBVhZ7AQ" name="rotation" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQQhGIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQQhGYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhGoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8XIaBEeaVYIZzHZR7BA" name="rotation" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8XYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8XoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8X4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQQhG4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhHIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8YIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8YYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQQhHYWzEeaFx5FBVhZ7AQ" value="2"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQQhHoWzEeaFx5FBVhZ7AQ" value="2"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yhG8YoaBEeaVYIZzHZR7BA" value="2"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG8Y4aBEeaVYIZzHZR7BA" value="2"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQQhH4WzEeaFx5FBVhZ7AQ" name="ErrorMatrix3x3">
-          <eAnnotations xmi:id="_yQQhIIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQQhIYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhIoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG8ZIaBEeaVYIZzHZR7BA" name="ErrorMatrix3x3">
+          <eAnnotations xmi:id="_yhG8ZYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG8ZoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8Z4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQQhI4WzEeaFx5FBVhZ7AQ" general="_yQP6JIWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQQhJIWzEeaFx5FBVhZ7AQ" name="matrix" visibility="public" type="_yQGJAYWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQQhJYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQQhJoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhJ4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG8aIaBEeaVYIZzHZR7BA" general="_yhG8AIaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8aYaBEeaVYIZzHZR7BA" name="matrix" visibility="public" type="_yhG1bYaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8aoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8a4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8bIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQQhKIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhKYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8bYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8boaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQQhKoWzEeaFx5FBVhZ7AQ" name="AssociatedQuantity">
-          <eAnnotations xmi:id="_yQQhK4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQQhLIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhLYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_yhG8b4aBEeaVYIZzHZR7BA" name="Epoch">
+          <eAnnotations xmi:id="_yhG8cIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG8cYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8coaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQQhLoWzEeaFx5FBVhZ7AQ" name="axis" visibility="public" type="_yQOE14WzEeaFx5FBVhZ7AQ" association="_yQQhO4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQQhL4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQQhMIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhMYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8c4aBEeaVYIZzHZR7BA" name="type" visibility="public" type="_yhG8f4aBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8dIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8dYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8doaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQQhMoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhM4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8d4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8eIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQQhNIWzEeaFx5FBVhZ7AQ"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQQhNYWzEeaFx5FBVhZ7AQ" name="loc" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQQhNoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQQhN4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhOIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8eYaBEeaVYIZzHZR7BA" name="year" visibility="public" type="_yhG084aBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8eoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8e4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8fIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQQhOYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhOoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8fYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8foaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQQhO4WzEeaFx5FBVhZ7AQ" memberEnd="_yQQhLoWzEeaFx5FBVhZ7AQ _yQQhPIWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQQhPIWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQQhKoWzEeaFx5FBVhZ7AQ" association="_yQQhO4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQQhPYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQQhPoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhP4WzEeaFx5FBVhZ7AQ" value="0"/>
-              </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQQhQIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhQYWzEeaFx5FBVhZ7AQ" value="read_write"/>
-              </contents>
-            </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQQhQoWzEeaFx5FBVhZ7AQ"/>
-          </ownedEnd>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_yQQhQ4WzEeaFx5FBVhZ7AQ" name="StdRefPosition">
-          <eAnnotations xmi:id="_yQQhRIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQQhRYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhRoWzEeaFx5FBVhZ7AQ" value="0"/>
-            </contents>
-          </eAnnotations>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhR4WzEeaFx5FBVhZ7AQ" name="TOPOCENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhSIWzEeaFx5FBVhZ7AQ" name="BARYCENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhSYWzEeaFx5FBVhZ7AQ" name="HELIOCENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhSoWzEeaFx5FBVhZ7AQ" name="GEOCENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhS4WzEeaFx5FBVhZ7AQ" name="GALACTIC_CENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhTIWzEeaFx5FBVhZ7AQ" name="LOCAL_GROUP_CENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhTYWzEeaFx5FBVhZ7AQ" name="MOON"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhToWzEeaFx5FBVhZ7AQ" name="EMBARYCENTER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhT4WzEeaFx5FBVhZ7AQ" name="MERCURY"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhUIWzEeaFx5FBVhZ7AQ" name="VENUS"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhUYWzEeaFx5FBVhZ7AQ" name="MARS"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhUoWzEeaFx5FBVhZ7AQ" name="JUPITER"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhU4WzEeaFx5FBVhZ7AQ" name="SATURN"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhVIWzEeaFx5FBVhZ7AQ" name="URANUS"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhVYWzEeaFx5FBVhZ7AQ" name="NEPTUNE"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhVoWzEeaFx5FBVhZ7AQ" name="PLUTO"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhV4WzEeaFx5FBVhZ7AQ" name="RELOCATABLE"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhWIWzEeaFx5FBVhZ7AQ" name="LSR"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhWYWzEeaFx5FBVhZ7AQ" name="LSRK"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhWoWzEeaFx5FBVhZ7AQ" name="LSRD"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhW4WzEeaFx5FBVhZ7AQ" name="UNKNOWN"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhXIWzEeaFx5FBVhZ7AQ" name="CUSTOM"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_yQQhXYWzEeaFx5FBVhZ7AQ" name="StdRefFrame">
-          <eAnnotations xmi:id="_yQQhXoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQQhX4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQQhYIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_yhG8f4aBEeaVYIZzHZR7BA" name="EpochType">
+          <eAnnotations xmi:id="_yhG8gIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG8gYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8goaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhYYWzEeaFx5FBVhZ7AQ" name="ICRS"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhYoWzEeaFx5FBVhZ7AQ" name="FK4"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhY4WzEeaFx5FBVhZ7AQ" name="FK5"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhZIWzEeaFx5FBVhZ7AQ" name="ECLIPTIC"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhZYWzEeaFx5FBVhZ7AQ" name="GALACTIC_I"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhZoWzEeaFx5FBVhZ7AQ" name="GALACTIC_II"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhZ4WzEeaFx5FBVhZ7AQ" name="SUPER_GALACTIC"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhaIWzEeaFx5FBVhZ7AQ" name="AZ_EL"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhaYWzEeaFx5FBVhZ7AQ" name="BODY"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhaoWzEeaFx5FBVhZ7AQ" name="GEO_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQha4WzEeaFx5FBVhZ7AQ" name="GEO_D"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhbIWzEeaFx5FBVhZ7AQ" name="MAG"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhbYWzEeaFx5FBVhZ7AQ" name="GSE"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhboWzEeaFx5FBVhZ7AQ" name="GSM"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhb4WzEeaFx5FBVhZ7AQ" name="SM"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhcIWzEeaFx5FBVhZ7AQ" name="HGC"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhcYWzEeaFx5FBVhZ7AQ" name="HEE"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhcoWzEeaFx5FBVhZ7AQ" name="HEEQ"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhc4WzEeaFx5FBVhZ7AQ" name="HCI"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhdIWzEeaFx5FBVhZ7AQ" name="HCD"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhdYWzEeaFx5FBVhZ7AQ" name="MERCURY_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQQhdoWzEeaFx5FBVhZ7AQ" name="VENUS_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRIAIWzEeaFx5FBVhZ7AQ" name="LUNA_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRIAYWzEeaFx5FBVhZ7AQ" name="MARS_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRIAoWzEeaFx5FBVhZ7AQ" name="JUPITER_C_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRIA4WzEeaFx5FBVhZ7AQ" name="SATURN_C_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRIBIWzEeaFx5FBVhZ7AQ" name="URANUS_C_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRIBYWzEeaFx5FBVhZ7AQ" name="NEPTUNE_C_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRIBoWzEeaFx5FBVhZ7AQ" name="PLUTO_C"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRIB4WzEeaFx5FBVhZ7AQ" name="MERCURY_G"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRICIWzEeaFx5FBVhZ7AQ" name="VENUS_G"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRICYWzEeaFx5FBVhZ7AQ" name="LUNA_G"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRICoWzEeaFx5FBVhZ7AQ" name="MARS_G"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRIC4WzEeaFx5FBVhZ7AQ" name="JUPITER_G_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRIDIWzEeaFx5FBVhZ7AQ" name="SATURN_G_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRIDYWzEeaFx5FBVhZ7AQ" name="URANUS_G_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRIDoWzEeaFx5FBVhZ7AQ" name="NEPTUNE_G_III"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRID4WzEeaFx5FBVhZ7AQ" name="PLUTO_G"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRIEIWzEeaFx5FBVhZ7AQ" name="UNKNOWN"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRIEYWzEeaFx5FBVhZ7AQ" name="CUSTOM"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8g4aBEeaVYIZzHZR7BA" name="J"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8hIaBEeaVYIZzHZR7BA" name="B"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_yQRIEoWzEeaFx5FBVhZ7AQ" name="Epoch">
-          <eAnnotations xmi:id="_yQRIE4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQRIFIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIFYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:DataType" xmi:id="_yhG8hYaBEeaVYIZzHZR7BA" name="AssociatedValue">
+          <eAnnotations xmi:id="_yhG8hoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG8h4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8iIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQRIFoWzEeaFx5FBVhZ7AQ" name="type" visibility="public" type="_yQRIIoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQRIF4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRIGIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIGYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8iYaBEeaVYIZzHZR7BA" name="axis" visibility="public" type="_yhG6xoaBEeaVYIZzHZR7BA" association="_yhG8loaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG8ioaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8i4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8jIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRIGoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIG4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8jYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8joaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG8j4aBEeaVYIZzHZR7BA"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQRIHIWzEeaFx5FBVhZ7AQ" name="year" visibility="public" type="_yQFh34WzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQRIHYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRIHoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIH4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8kIaBEeaVYIZzHZR7BA" name="loc" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8kYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8koaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8k4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRIIIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIIYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8lIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8lYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Enumeration" xmi:id="_yQRIIoWzEeaFx5FBVhZ7AQ" name="EpochType">
-          <eAnnotations xmi:id="_yQRII4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQRIJIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIJYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG8loaBEeaVYIZzHZR7BA" memberEnd="_yhG8iYaBEeaVYIZzHZR7BA _yhG8l4aBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG8l4aBEeaVYIZzHZR7BA" visibility="public" type="_yhG8hYaBEeaVYIZzHZR7BA" association="_yhG8loaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG8mIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8mYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8moaBEeaVYIZzHZR7BA" value="0"/>
+              </contents>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8m4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8nIaBEeaVYIZzHZR7BA" value="read_write"/>
+              </contents>
+            </eAnnotations>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG8nYaBEeaVYIZzHZR7BA"/>
+          </ownedEnd>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_yhG8noaBEeaVYIZzHZR7BA" name="StdRefPosition">
+          <eAnnotations xmi:id="_yhG8n4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG8oIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8oYaBEeaVYIZzHZR7BA" value="0"/>
+            </contents>
+          </eAnnotations>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8ooaBEeaVYIZzHZR7BA" name="TOPOCENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8o4aBEeaVYIZzHZR7BA" name="BARYCENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8pIaBEeaVYIZzHZR7BA" name="HELIOCENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8pYaBEeaVYIZzHZR7BA" name="GEOCENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8poaBEeaVYIZzHZR7BA" name="GALACTIC_CENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8p4aBEeaVYIZzHZR7BA" name="LOCAL_GROUP_CENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8qIaBEeaVYIZzHZR7BA" name="MOON"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8qYaBEeaVYIZzHZR7BA" name="EMBARYCENTER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8qoaBEeaVYIZzHZR7BA" name="MERCURY"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8q4aBEeaVYIZzHZR7BA" name="VENUS"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8rIaBEeaVYIZzHZR7BA" name="MARS"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8rYaBEeaVYIZzHZR7BA" name="JUPITER"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8roaBEeaVYIZzHZR7BA" name="SATURN"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8r4aBEeaVYIZzHZR7BA" name="URANUS"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8sIaBEeaVYIZzHZR7BA" name="NEPTUNE"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8sYaBEeaVYIZzHZR7BA" name="PLUTO"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8soaBEeaVYIZzHZR7BA" name="RELOCATABLE"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8s4aBEeaVYIZzHZR7BA" name="LSR"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8tIaBEeaVYIZzHZR7BA" name="LSRK"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8tYaBEeaVYIZzHZR7BA" name="LSRD"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8toaBEeaVYIZzHZR7BA" name="UNKNOWN"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8t4aBEeaVYIZzHZR7BA" name="CUSTOM"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Enumeration" xmi:id="_yhG8uIaBEeaVYIZzHZR7BA" name="StdRefFrame">
+          <eAnnotations xmi:id="_yhG8uYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG8uoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8u4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRIJoWzEeaFx5FBVhZ7AQ" name="J"/>
-          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yQRIJ4WzEeaFx5FBVhZ7AQ" name="B"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8vIaBEeaVYIZzHZR7BA" name="ICRS"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8vYaBEeaVYIZzHZR7BA" name="FK4"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8voaBEeaVYIZzHZR7BA" name="FK5"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8v4aBEeaVYIZzHZR7BA" name="ECLIPTIC"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8wIaBEeaVYIZzHZR7BA" name="GALACTIC_I"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8wYaBEeaVYIZzHZR7BA" name="GALACTIC_II"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8woaBEeaVYIZzHZR7BA" name="SUPER_GALACTIC"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8w4aBEeaVYIZzHZR7BA" name="AZ_EL"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8xIaBEeaVYIZzHZR7BA" name="BODY"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8xYaBEeaVYIZzHZR7BA" name="GEO_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8xoaBEeaVYIZzHZR7BA" name="GEO_D"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8x4aBEeaVYIZzHZR7BA" name="MAG"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8yIaBEeaVYIZzHZR7BA" name="GSE"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8yYaBEeaVYIZzHZR7BA" name="GSM"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8yoaBEeaVYIZzHZR7BA" name="SM"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8y4aBEeaVYIZzHZR7BA" name="HGC"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8zIaBEeaVYIZzHZR7BA" name="HEE"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8zYaBEeaVYIZzHZR7BA" name="HEEQ"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8zoaBEeaVYIZzHZR7BA" name="HCI"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG8z4aBEeaVYIZzHZR7BA" name="HCD"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG80IaBEeaVYIZzHZR7BA" name="MERCURY_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG80YaBEeaVYIZzHZR7BA" name="VENUS_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG80oaBEeaVYIZzHZR7BA" name="LUNA_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG804aBEeaVYIZzHZR7BA" name="MARS_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG81IaBEeaVYIZzHZR7BA" name="JUPITER_C_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG81YaBEeaVYIZzHZR7BA" name="SATURN_C_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG81oaBEeaVYIZzHZR7BA" name="URANUS_C_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG814aBEeaVYIZzHZR7BA" name="NEPTUNE_C_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG82IaBEeaVYIZzHZR7BA" name="PLUTO_C"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG82YaBEeaVYIZzHZR7BA" name="MERCURY_G"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG82oaBEeaVYIZzHZR7BA" name="VENUS_G"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG824aBEeaVYIZzHZR7BA" name="LUNA_G"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG83IaBEeaVYIZzHZR7BA" name="MARS_G"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG83YaBEeaVYIZzHZR7BA" name="JUPITER_G_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG83oaBEeaVYIZzHZR7BA" name="SATURN_G_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG834aBEeaVYIZzHZR7BA" name="URANUS_G_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG84IaBEeaVYIZzHZR7BA" name="NEPTUNE_G_III"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG84YaBEeaVYIZzHZR7BA" name="PLUTO_G"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG84oaBEeaVYIZzHZR7BA" name="UNKNOWN"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_yhG844aBEeaVYIZzHZR7BA" name="CUSTOM"/>
         </packagedElement>
       </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_yQRIKIWzEeaFx5FBVhZ7AQ" name="temporal">
-        <eAnnotations xmi:id="_yQRIKYWzEeaFx5FBVhZ7AQ" source="Objing">
-          <contents xmi:type="uml:Property" xmi:id="_yQRIKoWzEeaFx5FBVhZ7AQ" name="Visibility">
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIK4WzEeaFx5FBVhZ7AQ" value="0"/>
+      <packagedElement xmi:type="uml:Package" xmi:id="_yhG85IaBEeaVYIZzHZR7BA" name="temporal">
+        <eAnnotations xmi:id="_yhG85YaBEeaVYIZzHZR7BA" source="Objing">
+          <contents xmi:type="uml:Property" xmi:id="_yhG85oaBEeaVYIZzHZR7BA" name="Visibility">
+            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG854aBEeaVYIZzHZR7BA" value="0"/>
           </contents>
         </eAnnotations>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQRILIWzEeaFx5FBVhZ7AQ" memberEnd="_yQIllIWzEeaFx5FBVhZ7AQ _yQRILYWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQRILYWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQIliIWzEeaFx5FBVhZ7AQ" association="_yQRILIWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQRILoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRIL4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIMIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG86IaBEeaVYIZzHZR7BA" memberEnd="_yhG3aoaBEeaVYIZzHZR7BA _yhG86YaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG86YaBEeaVYIZzHZR7BA" visibility="public" type="_yhG3XoaBEeaVYIZzHZR7BA" association="_yhG86IaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG86oaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG864aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG87IaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRIMYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIMoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG87YaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG87oaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQRIM4WzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG874aBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQRINIWzEeaFx5FBVhZ7AQ" name="TimeFrame">
-          <eAnnotations xmi:id="_yQRINYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQRINoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIN4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG88IaBEeaVYIZzHZR7BA" name="TimeBasis" isAbstract="true">
+          <eAnnotations xmi:id="_yhG88YaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG88oaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG884aBEeaVYIZzHZR7BA" value="0"/>
+            </contents>
+          </eAnnotations>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG89IaBEeaVYIZzHZR7BA" name="StdTimeBasis">
+          <eAnnotations xmi:id="_yhG89YaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG89oaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG894aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQRIOIWzEeaFx5FBVhZ7AQ" general="_yQJMTIWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQRIOYWzEeaFx5FBVhZ7AQ" name="basis" visibility="public" type="_yQRvaYWzEeaFx5FBVhZ7AQ" association="_yQRIRYWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQRIOoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRIO4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIPIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG8-IaBEeaVYIZzHZR7BA" general="_yhG88IaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8-YaBEeaVYIZzHZR7BA" name="origin" visibility="public" type="_yhG9-IaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG8-oaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG8-4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8_IaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRIPYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIPoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG8_YaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG8_oaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQRIP4WzEeaFx5FBVhZ7AQ" name="coordSpace" visibility="public" type="_yQSWMIWzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQRITYWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQRIQIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRIQYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIQoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG8_4aBEeaVYIZzHZR7BA" name="timescale" visibility="public" type="_yhQl5YaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG9AIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG9AYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9AoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRIQ4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIRIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG9A4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9BIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQRIRYWzEeaFx5FBVhZ7AQ" memberEnd="_yQRIOYWzEeaFx5FBVhZ7AQ _yQRIRoWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQRIRoWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQRINIWzEeaFx5FBVhZ7AQ" association="_yQRIRYWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQRIR4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRISIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRISYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG9BYaBEeaVYIZzHZR7BA" name="refPosition" visibility="public" type="_yhG8noaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG9BoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG9B4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9CIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRISoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIS4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG9CYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9CoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQRITIWzEeaFx5FBVhZ7AQ"/>
-          </ownedEnd>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQRITYWzEeaFx5FBVhZ7AQ" memberEnd="_yQRIP4WzEeaFx5FBVhZ7AQ _yQRIToWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQRIToWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQRINIWzEeaFx5FBVhZ7AQ" association="_yQRITYWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQRIT4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRIUIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIUYWzEeaFx5FBVhZ7AQ" value="0"/>
+          </ownedAttribute>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG9C4aBEeaVYIZzHZR7BA" name="refDirection" visibility="public" type="_yhG62IaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG9DIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG9DYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9DoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRIUoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIU4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG9D4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9EIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-          </ownedEnd>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG9EYaBEeaVYIZzHZR7BA"/>
+          </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQRIVIWzEeaFx5FBVhZ7AQ" name="CoordAxis">
-          <eAnnotations xmi:id="_yQRIVYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQRIVoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIV4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG9EoaBEeaVYIZzHZR7BA" name="CustomTimeBasis">
+          <eAnnotations xmi:id="_yhG9E4aBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG9FIaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9FYaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQRIWIWzEeaFx5FBVhZ7AQ" name="domainMin" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQRIWYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRIWoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIW4WzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG9FoaBEeaVYIZzHZR7BA" general="_yhG88IaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG9F4aBEeaVYIZzHZR7BA" name="basis" visibility="public" type="_yhG88IaBEeaVYIZzHZR7BA" association="_yhG9K4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG9GIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG9GYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9GoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRIXIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIXYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG9G4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9HIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQRIXoWzEeaFx5FBVhZ7AQ"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQRIX4WzEeaFx5FBVhZ7AQ" name="domainMax" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQRIYIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRIYYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIYoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG9HYaBEeaVYIZzHZR7BA" name="offset" visibility="public" type="_yhG9_4aBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG9HoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG9H4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9IIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRIY4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIZIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG9IYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9IoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQRIZYWzEeaFx5FBVhZ7AQ"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG9I4aBEeaVYIZzHZR7BA"/>
           </ownedAttribute>
-        </packagedElement>
-        <packagedElement xmi:type="uml:DataType" xmi:id="_yQRIZoWzEeaFx5FBVhZ7AQ" name="TimeCoord">
-          <eAnnotations xmi:id="_yQRIZ4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQRIaIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIaYWzEeaFx5FBVhZ7AQ" value="0"/>
-            </contents>
-          </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQRIaoWzEeaFx5FBVhZ7AQ" name="elem" visibility="public" type="_yQSWdoWzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQRIcIWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQRIa4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRIbIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIbYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG9JIaBEeaVYIZzHZR7BA" name="refPosition" visibility="public" type="_yhG62IaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG9JYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG9JoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9J4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRIboWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIb4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG9KIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9KYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG9KoaBEeaVYIZzHZR7BA"/>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQRIcIWzEeaFx5FBVhZ7AQ" memberEnd="_yQRIaoWzEeaFx5FBVhZ7AQ _yQRIcYWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQRIcYWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQRIZoWzEeaFx5FBVhZ7AQ" association="_yQRIcIWzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQRIcoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRIc4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIdIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG9K4aBEeaVYIZzHZR7BA" memberEnd="_yhG9F4aBEeaVYIZzHZR7BA _yhG9LIaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG9LIaBEeaVYIZzHZR7BA" visibility="public" type="_yhG9EoaBEeaVYIZzHZR7BA" association="_yhG9K4aBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG9LYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG9LoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9L4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRIdYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIdoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG9MIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9MYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG9MoaBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQRId4WzEeaFx5FBVhZ7AQ" name="Time">
-          <eAnnotations xmi:id="_yQRIeIWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQRIeYWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRIeoWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG9M4aBEeaVYIZzHZR7BA" name="TimeFrame">
+          <eAnnotations xmi:id="_yhG9NIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG9NYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9NoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQRIe4WzEeaFx5FBVhZ7AQ" name="error" visibility="public" type="_yQRvIoWzEeaFx5FBVhZ7AQ" aggregation="composite" association="_yQRvG4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQRIfIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRIfYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvEIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG9N4aBEeaVYIZzHZR7BA" general="_yhG3jYaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG9OIaBEeaVYIZzHZR7BA" name="basis" visibility="public" type="_yhG88IaBEeaVYIZzHZR7BA" association="_yhG9RIaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG9OYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG9OoaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9O4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRvEYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvEoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG9PIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9PYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yQRvE4WzEeaFx5FBVhZ7AQ" value="*"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yQRvFIWzEeaFx5FBVhZ7AQ"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQRvFYWzEeaFx5FBVhZ7AQ" name="coord" visibility="public" type="_yQRIZoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQRvFoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRvF4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvGIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG9PoaBEeaVYIZzHZR7BA" name="coordSpace" visibility="public" type="_yhG9U4aBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG9TIaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG9P4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG9QIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9QYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRvGYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvGoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG9QoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9Q4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
         </packagedElement>
-        <packagedElement xmi:type="uml:Association" xmi:id="_yQRvG4WzEeaFx5FBVhZ7AQ" memberEnd="_yQRIe4WzEeaFx5FBVhZ7AQ _yQRvHIWzEeaFx5FBVhZ7AQ">
-          <ownedEnd xmi:type="uml:Property" xmi:id="_yQRvHIWzEeaFx5FBVhZ7AQ" visibility="public" type="_yQRId4WzEeaFx5FBVhZ7AQ" association="_yQRvG4WzEeaFx5FBVhZ7AQ">
-            <eAnnotations xmi:id="_yQRvHYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRvHoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvH4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG9RIaBEeaVYIZzHZR7BA" memberEnd="_yhG9OIaBEeaVYIZzHZR7BA _yhG9RYaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG9RYaBEeaVYIZzHZR7BA" visibility="public" type="_yhG9M4aBEeaVYIZzHZR7BA" association="_yhG9RIaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG9RoaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG9R4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9SIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRvIIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvIYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG9SYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9SoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG9S4aBEeaVYIZzHZR7BA"/>
           </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQRvIoWzEeaFx5FBVhZ7AQ" name="Uncertainty" isAbstract="true">
-          <eAnnotations xmi:id="_yQRvI4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQRvJIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvJYWzEeaFx5FBVhZ7AQ" value="0"/>
-            </contents>
-          </eAnnotations>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQRvJoWzEeaFx5FBVhZ7AQ" name="flavor" visibility="public" type="_yQFh6YWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQRvJ4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRvKIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvKYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG9TIaBEeaVYIZzHZR7BA" memberEnd="_yhG9PoaBEeaVYIZzHZR7BA _yhG9TYaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG9TYaBEeaVYIZzHZR7BA" visibility="public" type="_yhG9M4aBEeaVYIZzHZR7BA" association="_yhG9TIaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG9ToaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG9T4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9UIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRvKoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvK4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG9UYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9UoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-          </ownedAttribute>
+          </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQRvLIWzEeaFx5FBVhZ7AQ" name="Bounds">
-          <eAnnotations xmi:id="_yQRvLYWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQRvLoWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvL4WzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG9U4aBEeaVYIZzHZR7BA" name="CoordSpace" isAbstract="true">
+          <eAnnotations xmi:id="_yhG9VIaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG9VYaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9VoaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQRvMIWzEeaFx5FBVhZ7AQ" general="_yQRvIoWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQRvMYWzEeaFx5FBVhZ7AQ" name="hiLimit" visibility="public" type="_yQRIZoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQRvMoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRvM4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvNIWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG9V4aBEeaVYIZzHZR7BA" name="axis" visibility="public" type="_yhG9fIaBEeaVYIZzHZR7BA" aggregation="composite" association="_yhG9XYaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG9WIaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG9WYaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9WoaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRvNYWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvNoWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG9W4aBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9XIaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQRvN4WzEeaFx5FBVhZ7AQ" name="loLimit" visibility="public" type="_yQRIZoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQRvOIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRvOYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvOoWzEeaFx5FBVhZ7AQ" value="0"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG9XYaBEeaVYIZzHZR7BA" memberEnd="_yhG9V4aBEeaVYIZzHZR7BA _yhG9XoaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG9XoaBEeaVYIZzHZR7BA" visibility="public" type="_yhG9U4aBEeaVYIZzHZR7BA" association="_yhG9XYaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG9X4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG9YIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9YYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRvO4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvPIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG9YoaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9Y4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-          </ownedAttribute>
+          </ownedEnd>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG9ZIaBEeaVYIZzHZR7BA" name="Cartesian" isAbstract="true">
+          <eAnnotations xmi:id="_yhG9ZYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG9ZoaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9Z4aBEeaVYIZzHZR7BA" value="0"/>
+            </contents>
+          </eAnnotations>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG9aIaBEeaVYIZzHZR7BA" general="_yhG9U4aBEeaVYIZzHZR7BA"/>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQRvPYWzEeaFx5FBVhZ7AQ" name="SymmetricInterval">
-          <eAnnotations xmi:id="_yQRvPoWzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQRvP4WzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvQIWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG9aYaBEeaVYIZzHZR7BA" name="TimeSpace">
+          <eAnnotations xmi:id="_yhG9aoaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG9a4aBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9bIaBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQRvQYWzEeaFx5FBVhZ7AQ" general="_yQRvIoWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQRvQoWzEeaFx5FBVhZ7AQ" name="center" visibility="public" type="_yQRIZoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQRvQ4WzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRvRIWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvRYWzEeaFx5FBVhZ7AQ" value="0"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_yhG9bYaBEeaVYIZzHZR7BA" general="_yhG9ZIaBEeaVYIZzHZR7BA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG9boaBEeaVYIZzHZR7BA" name="t" visibility="public" type="_yhG9fIaBEeaVYIZzHZR7BA" association="_yhG9dIaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG9b4aBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG9cIaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9cYaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRvRoWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvR4WzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG9coaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9c4aBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQRvSIWzEeaFx5FBVhZ7AQ" name="size" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQRvSYWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRvSoWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvS4WzEeaFx5FBVhZ7AQ" value="0"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Association" xmi:id="_yhG9dIaBEeaVYIZzHZR7BA" memberEnd="_yhG9boaBEeaVYIZzHZR7BA _yhG9dYaBEeaVYIZzHZR7BA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yhG9dYaBEeaVYIZzHZR7BA" visibility="public" type="_yhG9aYaBEeaVYIZzHZR7BA" association="_yhG9dIaBEeaVYIZzHZR7BA">
+            <eAnnotations xmi:id="_yhG9doaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG9d4aBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9eIaBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRvTIWzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvTYWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG9eYaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9eoaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
-          </ownedAttribute>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG9e4aBEeaVYIZzHZR7BA"/>
+          </ownedEnd>
         </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_yQRvToWzEeaFx5FBVhZ7AQ" name="AssymetricInterval">
-          <eAnnotations xmi:id="_yQRvT4WzEeaFx5FBVhZ7AQ" source="Objing">
-            <contents xmi:type="uml:Property" xmi:id="_yQRvUIWzEeaFx5FBVhZ7AQ" name="Visibility">
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvUYWzEeaFx5FBVhZ7AQ" value="0"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_yhG9fIaBEeaVYIZzHZR7BA" name="CoordAxis">
+          <eAnnotations xmi:id="_yhG9fYaBEeaVYIZzHZR7BA" source="Objing">
+            <contents xmi:type="uml:Property" xmi:id="_yhG9foaBEeaVYIZzHZR7BA" name="Visibility">
+              <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9f4aBEeaVYIZzHZR7BA" value="0"/>
             </contents>
           </eAnnotations>
-          <generalization xmi:type="uml:Generalization" xmi:id="_yQRvUoWzEeaFx5FBVhZ7AQ" general="_yQRvIoWzEeaFx5FBVhZ7AQ"/>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQRvU4WzEeaFx5FBVhZ7AQ" name="center" visibility="public" type="_yQRIZoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQRvVIWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRvVYWzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvVoWzEeaFx5FBVhZ7AQ" value="0"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yhG9gIaBEeaVYIZzHZR7BA" name="domainMin" visibility="public" type="_yhG1KoaBEeaVYIZzHZR7BA" isUnique="false">
+            <eAnnotations xmi:id="_yhG9gYaBEeaVYIZzHZR7BA" source="Objing">
+              <contents xmi:type="uml:Property" xmi:id="_yhG9goaBEeaVYIZzHZR7BA" name="Visibility">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9g4aBEeaVYIZzHZR7BA" value="0"/>
               </contents>
-              <contents xmi:type="uml:Property" xmi:id="_yQRvV4WzEeaFx5FBVhZ7AQ" name="AccessMode">
-                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yQRvWIWzEeaFx5FBVhZ7AQ" value="read_write"/>
+              <contents xmi:type="uml:Property" xmi:id="_yhG9hIaBEeaVYIZzHZR7BA" name="AccessMode">
+                <defaultValue xmi:type="uml:LiteralString" xmi:id="_yhG9hYaBEeaVYIZzHZR7BA" value="read_write"/>
               </contents>
             </eAnnotations>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yhG9hoaBEeaVYIZzHZR7BA"/>
           </ownedAttribute>
-          <ownedAttribute xmi:type="uml:Property" xmi:id="_yQRvWYWzEeaFx5FBVhZ7AQ" name="plus" visibility="public" type="_yQFiFoWzEeaFx5FBVhZ7AQ" isUnique="false">
-            <eAnnotations xmi:id="_yQRvWoWzEeaFx5FBVhZ7AQ" source="Objing">
-              <contents xmi:type="uml:Property" xmi:id="_yQRvW4WzEeaFx5FBVhZ7AQ" name="Visibility">
-                <defaultValue