diff --git a/doc/Makefile b/doc/Makefile
index 878ab37..6a8add1 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -7,10 +7,10 @@ DOCNAME = MANGO
 DOCVERSION = 1.0
 
 # Publication date, ISO format; update manually for "releases"
-DOCDATE = 2026-03-05
+DOCDATE = 2026-04-29
 
 # What is it you're writing: NOTE, WD, PR, REC, PEN, or EN
-DOCTYPE = PR
+DOCTYPE = REC
 
 # An e-mail address of the person doing the submission to the document
 # repository (can be empty until a make upload is being made)
diff --git a/doc/ivoatexmeta.tex b/doc/ivoatexmeta.tex
index 4b5bb72..0c9553b 100644
--- a/doc/ivoatexmeta.tex
+++ b/doc/ivoatexmeta.tex
@@ -1,7 +1,7 @@
 % GENERATED FILE -- edit this in the Makefile
 \newcommand{\ivoaDocversion}{1.0}
-\newcommand{\ivoaDocdate}{2026-03-05}
-\newcommand{\ivoaDocdatecode}{20260305}
-\newcommand{\ivoaDoctype}{PR}
+\newcommand{\ivoaDocdate}{2026-04-29}
+\newcommand{\ivoaDocdatecode}{20260429}
+\newcommand{\ivoaDoctype}{REC}
 \newcommand{\ivoaDocname}{MANGO}
 \renewcommand{\ivoaBaseURL}{https://www.ivoa.net/documents/MANGO}
diff --git a/mivot/mango/mango.AssociatedMangoObject.xml b/mivot/mango/mango.AssociatedMangoObject.xml
index 6d6d292..8a8e915 100644
--- a/mivot/mango/mango.AssociatedMangoObject.xml
+++ b/mivot/mango/mango.AssociatedMangoObject.xml
@@ -1,50 +1,11 @@
 <INSTANCE dmrole="" dmtype="mango:AssociatedMangoObject">
-   <!-- This class gives the role of a link associating 2 \texttt{MangoObject} together." -->
+   <!-- Reference to another MANGO instance that is part of the associated data." -->
    <INSTANCE dmrole="mango:AssociatedMangoObject.semantics" dmtype="mango:VocabularyTerm">
-      <!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
+      <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
       <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
       <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
    </INSTANCE>
    <ATTRIBUTE dmrole="mango:AssociatedMangoObject.description" dmtype="ivoa:string" ref="@@@@@" value=""/>
-   <INSTANCE dmrole="mango:AssociatedMangoObject.mangoObject" dmtype="mango:MangoObject">
-      <!-- Central model class: applied to a data table, each row can be modelled as a \texttt{MangoObject} instance.
-Each \texttt{MangoObject} hosts a collection of physical or calculated parameters,
-a description of the data origin and an identifier." -->
-      <ATTRIBUTE dmrole="mango:MangoObject.identifier" dmtype="ivoa:string" ref="@@@@@" value=""/>
-      <COLLECTION dmrole="mango:MangoObject.propertyDock">
-         <INSTANCE dmrole="" dmtype="mango:Property">
-            <!-- Class holder for a \textit{flavor} of property, i.e., there should be a Property subclass for each \textit{flavor} 
-of Property being hosted.
-The property types are not limited to &#8220;physical or calculated&#8221; (eg: flags, assigned labels)
-This class specifies both type and role of the  property, and hosts the property instance itself.
-" -->
-            <INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">
-               <!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
-               <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
-               <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
-            </INSTANCE>
-            <ATTRIBUTE dmrole="mango:Property.description" dmtype="ivoa:string" ref="@@@@@" value=""/>
-            <COLLECTION dmrole="mango:Property.associatedProperties">
-               <INSTANCE dmtype="mango:Property"/>
-            </COLLECTION>
-         </INSTANCE>
-      </COLLECTION>
-      <COLLECTION dmrole="mango:MangoObject.mangoObjects">
-         <INSTANCE dmtype="mango:AssociatedMangoObject"/>
-      </COLLECTION>
-      <INSTANCE dmrole="mango:MangoObject.queryOrigin" dmtype="mango:origin.QueryOrigin">
-         <!-- Description of the query the  \texttt{MangoObject} results from." -->
-         <ATTRIBUTE dmrole="mango:origin.QueryOrigin.publisher" dmtype="ivoa:string" ref="@@@@@" value=""/>
-         <ATTRIBUTE dmrole="mango:origin.QueryOrigin.server_software" dmtype="ivoa:string" ref="@@@@@" value=""/>
-         <ATTRIBUTE dmrole="mango:origin.QueryOrigin.service_protocol" dmtype="ivoa:string" ref="@@@@@" value=""/>
-         <ATTRIBUTE dmrole="mango:origin.QueryOrigin.request" dmtype="ivoa:string" ref="@@@@@" value=""/>
-         <ATTRIBUTE dmrole="mango:origin.QueryOrigin.request_date" dmtype="ivoa:string" ref="@@@@@" value=""/>
-         <ATTRIBUTE dmrole="mango:origin.QueryOrigin.query" dmtype="ivoa:string" ref="@@@@@" value=""/>
-         <ATTRIBUTE dmrole="mango:origin.QueryOrigin.contact" dmtype="ivoa:string" ref="@@@@@" value=""/>
-         <ATTRIBUTE dmrole="mango:origin.QueryOrigin.ivoid" dmtype="ivoa:string" ref="@@@@@" value=""/>
-         <COLLECTION dmrole="mango:origin.QueryOrigin.dataOrigin">
-            <INSTANCE dmtype="mango:origin.DataOrigin"/>
-         </COLLECTION>
-      </INSTANCE>
-   </INSTANCE>
 </INSTANCE>
diff --git a/mivot/mango/mango.Brightness.xml b/mivot/mango/mango.Brightness.xml
index e2f30cd..c0ff1dd 100644
--- a/mivot/mango/mango.Brightness.xml
+++ b/mivot/mango/mango.Brightness.xml
@@ -1,10 +1,11 @@
 <INSTANCE dmrole="" dmtype="mango:Brightness">
-   <!-- Observed brightness of the \texttt{MangoObject}.
-The purpose of this property is to gather a brightness value with its error and its photometric calibration
-The distinction between fluxes and magnitudes is made by the unit.
-The photometric calibration is modeled by the \texttt{Phot} data model (1.1)." -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
    <INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">
-      <!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
+      <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
       <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
       <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
    </INSTANCE>
diff --git a/mivot/mango/mango.Color.xml b/mivot/mango/mango.Color.xml
index 2be20e0..0f055c3 100644
--- a/mivot/mango/mango.Color.xml
+++ b/mivot/mango/mango.Color.xml
@@ -1,10 +1,11 @@
 <INSTANCE dmrole="" dmtype="mango:Color">
-   <!-- Property that describes a color of the \texttt{MangoObject}.
-The purpose of this property is to gather a color value with its error and the 2 related filters (high and low)
-The color can be given as a magnitude difference or a hardness ratio.
-" -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
    <INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">
-      <!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
+      <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
       <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
       <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
    </INSTANCE>
@@ -16,11 +17,12 @@ The color can be given as a magnitude difference or a hardness ratio.
    <!-- Replace by an INSTANCE of a derived classes of error.PropertyError if applicable. -->
    <INSTANCE dmrole="mango:Color.error" dmtype="mango:error.PropertyError"/>
    <INSTANCE dmrole="mango:Color.colorDef" dmtype="mango:ColorDef">
-      <!-- Physical color definition giving the way a color is calculated (magnitude difference or hardness ratio)
-and the filters on which the color is based. 
-In case of hardness ratio, the energy bands might be modeled as instances of \texttt{Phot:PhotometryFilter} 
-with a square transfer function." -->
-      <!-- Enumeration of the different types of colors supported by the model. -->
+      <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
+      <!-- 
+          TODO : Missing description : please, update your UML model asap.
+         -->
       <!-- Enumeration datatype: supported values are ColorIndex HardnessRatio  -->
       <ATTRIBUTE dmrole="mango:ColorDef.definition" dmtype="mango:ColorDefinition" value="OneOf ColorIndex HardnessRatio "/>
       <INSTANCE dmrole="mango:ColorDef.high" dmtype="Phot:PhotometryFilter"/>
diff --git a/mivot/mango/mango.ColorDef.xml b/mivot/mango/mango.ColorDef.xml
index 843bac8..4b2c365 100644
--- a/mivot/mango/mango.ColorDef.xml
+++ b/mivot/mango/mango.ColorDef.xml
@@ -1,11 +1,10 @@
 <INSTANCE dmrole="" dmtype="mango:ColorDef">
-   <!-- Physical color definition giving the way a color is calculated (magnitude difference or hardness ratio)
-and the filters on which the color is based. 
-In case of hardness ratio, the energy bands might be modeled as instances of \texttt{Phot:PhotometryFilter} 
-with a square transfer function." -->
-   <!-- Enumeration of the different types of colors supported by the model. -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+         -->
    <!-- Enumeration datatype: supported values are ColorIndex HardnessRatio  -->
    <ATTRIBUTE dmrole="mango:ColorDef.definition" dmtype="mango:ColorDefinition" value="OneOf ColorIndex HardnessRatio "/>
-   <INSTANCE dmrole="mango:ColorDef.high" dmtype="Phot:PhotometryFilter"/>
-   <INSTANCE dmrole="mango:ColorDef.low" dmtype="Phot:PhotometryFilter"/>
 </INSTANCE>
diff --git a/mivot/mango/mango.DataLink.xml b/mivot/mango/mango.DataLink.xml
index 9b864f0..b9abf07 100644
--- a/mivot/mango/mango.DataLink.xml
+++ b/mivot/mango/mango.DataLink.xml
@@ -1,9 +1,9 @@
 <INSTANCE dmrole="" dmtype="mango:DataLink">
-   <!-- This property describes static links pointing to some external data.
-This allows services that do not implement DataLink services to expose linked data as 
-flattened DataLink (1.1) responses." -->
+   <!-- Class for associated data referenced by an URL" -->
    <INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">
-      <!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
+      <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
       <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
       <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
    </INSTANCE>
diff --git a/mivot/mango/mango.DateTime.xml b/mivot/mango/mango.DateTime.xml
index d9c7995..db8227b 100644
--- a/mivot/mango/mango.DateTime.xml
+++ b/mivot/mango/mango.DateTime.xml
@@ -1,11 +1,7 @@
 <INSTANCE dmrole="" dmtype="mango:DateTime">
-   <!-- Data type for timestamps and their representation. 
-Timestamps are modeled by a single value and a representation mode.
-There is no time scale associated with \texttt{mango:DateTime}. 
-The scale is either imposed by the representation mode or defined by the
-time coordinate system relevant for the host object,
-usually an instance of \texttt{mango:EpochPosition}.
-" -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
    <ATTRIBUTE dmrole="mango:DateTime.representation" dmtype="ivoa:string" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:DateTime.dateTime" dmtype="ivoa:datetime" unit="" ref="@@@@@" value=""/>
 </INSTANCE>
diff --git a/mivot/mango/mango.EpochPosition.xml b/mivot/mango/mango.EpochPosition.xml
index 13751f5..7136c14 100644
--- a/mivot/mango/mango.EpochPosition.xml
+++ b/mivot/mango/mango.EpochPosition.xml
@@ -1,59 +1,9 @@
 <INSTANCE dmrole="" dmtype="mango:EpochPosition">
-   <!--  This class (fig \ref{fig:EpochPosition}) is a flattened view of objects/concepts from the 
- Astronomical Measurements Model  \citep{2022ivoa.specQ1004R} that have been put together 
- to form a consistent description of the position of an object moving over time. 
- It consists of a celestial position, a proper motion, a radial velocity and a parallax and their associated 
- errors encapsulated into the \texttt{EpochPositionErrors} class. 
- The values of these properties are pulled from the underlying Astronomical Coordinates and Coordinate Systems 
- model \citep{2022ivoa.spec.1004R}.
- 
-At a high level the properties map as follows:
-\begin{itemize}
-    \item celestial position -> \texttt{meas:Position}
-    \item  proper motion -> \texttt{meas:ProperMotion}
-    \item  radial velocity -> \texttt{meas.Velocity}
-    \item  parallax -> no suitable counterpart at this time
-\end{itemize}
-
-
-All components use the same coordinate systems for both time and space coordinates.
-
-\begin{itemize}
-   \item Both position and proper motion reuse \texttt{coords:LonLatPoint} elements.
-   \item The space coordinate system is imported from \texttt{coords:SpaceSys}.
-   \item The time coordinate system is imported from \texttt{coords:TimeSys}.
-\end{itemize}
-
-
-It is recommended to use the \texttt{ObsDate} field to store the epoch of the observation instead
-of the \texttt{epoch} field of \texttt{coords:SpaceSys}. 
-There are 2 reasons for this:
-\begin{itemize}
-   \item Using the epoch of \texttt{coords:SpaceSys} requires to work with the
-         \texttt{coords:CustomRefLocation} class to carry the reference location.
-         This class does not support the standard reference locations such as e.g. BARYCENTER.
-   \item The observation date can be read in a column and therefore change with each data row.
-         In this case, it cannot be stored as an element of the space coordinate system
-         but as an \texttt{EpochPosition} attribute.
-\end{itemize}
-
-All components have their own units which must be consistent with each other. 
-This consistency is not enforced by the model.
-
-Possible correlations between \texttt{EpochPosition} parameters are handled by the \texttt{EpochPositionCorrelations} class.
-Errors along the different axes are grouped in the \texttt{EpochPositionErrors} class.
-
-In some cases the errors might conflict with the correlations:
-
-\begin{itemize}
-   \item \texttt{Ellipse} errors on position or proper motion must not be used together with the 
-         \texttt{longitudeLatitude} (or \texttt{pmLongitudePmLatitude}) correlation fields.
-         In fact, using elliptical errors implies a correlation between the two spatial axes which must not conflict
-         with the correlations defined in \texttt{EpochPositionCorrelations}.
-\end{itemize}
-" -->
+   <!-- Class grouping all parameters needed to define an object position at a given epoch. The space coordinate system is common to all attributes to insure the consistance between all of the instance parameters." -->
    <INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">
-      <!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
+      <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
       <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
       <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
    </INSTANCE>
@@ -70,7 +20,7 @@ In some cases the errors might conflict with the correlations:
    <ATTRIBUTE dmrole="mango:EpochPosition.obsDate" dmtype="ivoa:datetime" unit="" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:EpochPosition.pmCosLatApplied" dmtype="ivoa:boolean" unit="" ref="@@@@@" value=""/>
    <INSTANCE dmrole="mango:EpochPosition.errors" dmtype="mango:EpochPositionErrors">
-      <!-- Class holder for the errors of the EpochPosition attributes" -->
+      <!-- Class for the error attached to a EpochPosition. The component in this class represent the errors of individual parameters as well as errors due to the parameter correlations." -->
       <!-- Replace by an INSTANCE of a derived classes of error.PropertyError if applicable. -->
       <INSTANCE dmrole="mango:EpochPositionErrors.parallax" dmtype="mango:error.PropertyError"/>
       <!-- Replace by an INSTANCE of a derived classes of error.PropertyError if applicable. -->
@@ -81,7 +31,9 @@ In some cases the errors might conflict with the correlations:
       <INSTANCE dmrole="mango:EpochPositionErrors.position" dmtype="mango:error.PropertyError"/>
    </INSTANCE>
    <INSTANCE dmrole="mango:EpochPosition.correlations" dmtype="mango:EpochPositionCorrelations">
-      <!-- Class holder for the correlation coefficients between the \texttt{EpochPosition} components." -->
+      <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
       <ATTRIBUTE dmrole="mango:EpochPositionCorrelations.longitudeParallax" dmtype="ivoa:real" unit="" ref="@@@@@" value=""/>
       <ATTRIBUTE dmrole="mango:EpochPositionCorrelations.latitudeParallax" dmtype="ivoa:real" unit="" ref="@@@@@" value=""/>
       <ATTRIBUTE dmrole="mango:EpochPositionCorrelations.pmLongitudeParallax" dmtype="ivoa:real" unit="" ref="@@@@@" value=""/>
diff --git a/mivot/mango/mango.EpochPositionCorrelations.xml b/mivot/mango/mango.EpochPositionCorrelations.xml
index 5180811..a97ae35 100644
--- a/mivot/mango/mango.EpochPositionCorrelations.xml
+++ b/mivot/mango/mango.EpochPositionCorrelations.xml
@@ -1,5 +1,7 @@
 <INSTANCE dmrole="" dmtype="mango:EpochPositionCorrelations">
-   <!-- Class holder for the correlation coefficients between the \texttt{EpochPosition} components." -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
    <ATTRIBUTE dmrole="mango:EpochPositionCorrelations.longitudeParallax" dmtype="ivoa:real" unit="" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:EpochPositionCorrelations.latitudeParallax" dmtype="ivoa:real" unit="" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:EpochPositionCorrelations.pmLongitudeParallax" dmtype="ivoa:real" unit="" ref="@@@@@" value=""/>
diff --git a/mivot/mango/mango.EpochPositionErrors.xml b/mivot/mango/mango.EpochPositionErrors.xml
index 081f295..ffa144d 100644
--- a/mivot/mango/mango.EpochPositionErrors.xml
+++ b/mivot/mango/mango.EpochPositionErrors.xml
@@ -1,5 +1,5 @@
 <INSTANCE dmrole="" dmtype="mango:EpochPositionErrors">
-   <!-- Class holder for the errors of the EpochPosition attributes" -->
+   <!-- Class for the error attached to a EpochPosition. The component in this class represent the errors of individual parameters as well as errors due to the parameter correlations." -->
    <!-- Replace by an INSTANCE of a derived classes of error.PropertyError if applicable. -->
    <INSTANCE dmrole="mango:EpochPositionErrors.parallax" dmtype="mango:error.PropertyError"/>
    <!-- Replace by an INSTANCE of a derived classes of error.PropertyError if applicable. -->
diff --git a/mivot/mango/mango.Footprint.xml b/mivot/mango/mango.Footprint.xml
index b78703f..faf8443 100644
--- a/mivot/mango/mango.Footprint.xml
+++ b/mivot/mango/mango.Footprint.xml
@@ -1,12 +1,11 @@
 <INSTANCE dmrole="" dmtype="mango:Footprint">
-   <!-- Description of the spatial extent of the MANGO object (e.g. for dust clouds).
-Footprint is serialized as a string. 
-\begin{itemize}
-   \item The supported serialization modes are listed in the \texttt{FootprintSerialization} enumeration.
-   \item If the space coordinate system is not embedded in the serialization mode, it can be defined by the \texttt{spaceSys} reference.
-\end{itemize}" -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
    <INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">
-      <!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
+      <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
       <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
       <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
    </INSTANCE>
@@ -15,7 +14,9 @@ Footprint is serialized as a string.
       <INSTANCE dmtype="mango:Property"/>
    </COLLECTION>
    <ATTRIBUTE dmrole="mango:Footprint.serialization" dmtype="ivoa:string" ref="@@@@@" value=""/>
-   <!-- Enumeration of the supported serialization modes for the footprints -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+         -->
    <!-- Enumeration datatype: supported values are SMOC STC-S POLYGON  -->
    <ATTRIBUTE dmrole="mango:Footprint.mode" dmtype="mango:FootprintSerialization" value="OneOf SMOC STC-S POLYGON "/>
    <INSTANCE dmrole="mango:Footprint.spaceSys" dmtype="coords:SpaceSys"/>
diff --git a/mivot/mango/mango.Label.xml b/mivot/mango/mango.Label.xml
index 317ffe8..59a974c 100644
--- a/mivot/mango/mango.Label.xml
+++ b/mivot/mango/mango.Label.xml
@@ -1,11 +1,11 @@
 <INSTANCE dmrole="" dmtype="mango:Label">
-   <!-- Free text label seen as \texttt{MangoObject} property. 
-The meaning of the label must match the property \texttt{semantics} attribute. 
-This rule is not enforced by the model. 
-For example, the Label property can be used to associate the sky object class
-of the \texttt{MangoObject} (e.g., Cataclysmic Variable) with the appropriate vocabulary." -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
    <INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">
-      <!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
+      <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
       <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
       <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
    </INSTANCE>
diff --git a/mivot/mango/mango.MangoObject.xml b/mivot/mango/mango.MangoObject.xml
index a99da2b..1ac92dd 100644
--- a/mivot/mango/mango.MangoObject.xml
+++ b/mivot/mango/mango.MangoObject.xml
@@ -1,30 +1,27 @@
 <INSTANCE dmrole="" dmtype="mango:MangoObject">
-   <!-- Central model class: applied to a data table, each row can be modelled as a \texttt{MangoObject} instance.
-Each \texttt{MangoObject} hosts a collection of physical or calculated parameters,
-a description of the data origin and an identifier." -->
+   <!-- Root class of the model. MANGO instances are meant of be Source instances.
+A source is something with an identifier and two docks: one for the parameters and one for the associated data." -->
    <ATTRIBUTE dmrole="mango:MangoObject.identifier" dmtype="ivoa:string" ref="@@@@@" value=""/>
    <COLLECTION dmrole="mango:MangoObject.propertyDock">
       <INSTANCE dmrole="" dmtype="mango:Property">
-         <!-- Class holder for a \textit{flavor} of property, i.e., there should be a Property subclass for each \textit{flavor} 
-of Property being hosted.
-The property types are not limited to &#8220;physical or calculated&#8221; (eg: flags, assigned labels)
-This class specifies both type and role of the  property, and hosts the property instance itself.
-" -->
+         <!-- Reference to a particular measure of the Source.
+This class is used to specify the type of the measure as well as its role." -->
          <INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">
-            <!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
+            <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
             <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
             <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
          </INSTANCE>
          <ATTRIBUTE dmrole="mango:Property.description" dmtype="ivoa:string" ref="@@@@@" value=""/>
          <COLLECTION dmrole="mango:Property.associatedProperties">
             <INSTANCE dmrole="mango:Property.associatedProperties" dmtype="mango:Property">
-               <!-- Class holder for a \textit{flavor} of property, i.e., there should be a Property subclass for each \textit{flavor} 
-of Property being hosted.
-The property types are not limited to &#8220;physical or calculated&#8221; (eg: flags, assigned labels)
-This class specifies both type and role of the  property, and hosts the property instance itself.
-" -->
+               <!-- Reference to a particular measure of the Source.
+This class is used to specify the type of the measure as well as its role." -->
                <INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">
-                  <!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
+                  <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
                   <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
                   <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
                </INSTANCE>
@@ -37,28 +34,28 @@ This class specifies both type and role of the  property, and hosts the property
       </INSTANCE>
    </COLLECTION>
    <COLLECTION dmrole="mango:MangoObject.mangoObjects">
-      <INSTANCE dmrole="mango:MangoObject.mangoObjects" dmtype="mango:AssociatedMangoObject">
-         <!-- This class gives the role of a link associating 2 \texttt{MangoObject} together." -->
+      <INSTANCE dmrole="" dmtype="mango:AssociatedMangoObject">
+         <!-- Reference to another MANGO instance that is part of the associated data." -->
          <INSTANCE dmrole="mango:AssociatedMangoObject.semantics" dmtype="mango:VocabularyTerm">
-            <!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
+            <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
             <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
             <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
          </INSTANCE>
          <ATTRIBUTE dmrole="mango:AssociatedMangoObject.description" dmtype="ivoa:string" ref="@@@@@" value=""/>
          <INSTANCE dmrole="mango:AssociatedMangoObject.mangoObject" dmtype="mango:MangoObject">
-            <!-- Central model class: applied to a data table, each row can be modelled as a \texttt{MangoObject} instance.
-Each \texttt{MangoObject} hosts a collection of physical or calculated parameters,
-a description of the data origin and an identifier." -->
+            <!-- Root class of the model. MANGO instances are meant of be Source instances.
+A source is something with an identifier and two docks: one for the parameters and one for the associated data." -->
             <ATTRIBUTE dmrole="mango:MangoObject.identifier" dmtype="ivoa:string" ref="@@@@@" value=""/>
             <COLLECTION dmrole="mango:MangoObject.propertyDock">
                <INSTANCE dmrole="" dmtype="mango:Property">
-                  <!-- Class holder for a \textit{flavor} of property, i.e., there should be a Property subclass for each \textit{flavor} 
-of Property being hosted.
-The property types are not limited to &#8220;physical or calculated&#8221; (eg: flags, assigned labels)
-This class specifies both type and role of the  property, and hosts the property instance itself.
-" -->
+                  <!-- Reference to a particular measure of the Source.
+This class is used to specify the type of the measure as well as its role." -->
                   <INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">
-                     <!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
+                     <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
                      <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
                      <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
                   </INSTANCE>
@@ -69,10 +66,22 @@ This class specifies both type and role of the  property, and hosts the property
                </INSTANCE>
             </COLLECTION>
             <COLLECTION dmrole="mango:MangoObject.mangoObjects">
-               <INSTANCE dmtype="mango:AssociatedMangoObject"/>
+               <INSTANCE dmrole="" dmtype="mango:AssociatedMangoObject">
+                  <!-- Reference to another MANGO instance that is part of the associated data." -->
+                  <INSTANCE dmrole="mango:AssociatedMangoObject.semantics" dmtype="mango:VocabularyTerm">
+                     <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
+                     <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
+                     <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
+                  </INSTANCE>
+                  <ATTRIBUTE dmrole="mango:AssociatedMangoObject.description" dmtype="ivoa:string" ref="@@@@@" value=""/>
+               </INSTANCE>
             </COLLECTION>
             <INSTANCE dmrole="mango:MangoObject.queryOrigin" dmtype="mango:origin.QueryOrigin">
-               <!-- Description of the query the  \texttt{MangoObject} results from." -->
+               <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
                <ATTRIBUTE dmrole="mango:origin.QueryOrigin.publisher" dmtype="ivoa:string" ref="@@@@@" value=""/>
                <ATTRIBUTE dmrole="mango:origin.QueryOrigin.server_software" dmtype="ivoa:string" ref="@@@@@" value=""/>
                <ATTRIBUTE dmrole="mango:origin.QueryOrigin.service_protocol" dmtype="ivoa:string" ref="@@@@@" value=""/>
@@ -83,8 +92,9 @@ This class specifies both type and role of the  property, and hosts the property
                <ATTRIBUTE dmrole="mango:origin.QueryOrigin.ivoid" dmtype="ivoa:string" ref="@@@@@" value=""/>
                <COLLECTION dmrole="mango:origin.QueryOrigin.dataOrigin">
                   <INSTANCE dmrole="mango:origin.QueryOrigin.dataOrigin" dmtype="mango:origin.DataOrigin">
-                     <!-- Class representing the description of the origin of the queried dataset.
-" -->
+                     <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
                      <ATTRIBUTE dmrole="mango:origin.DataOrigin.ivoid" dmtype="ivoa:string" ref="@@@@@" value=""/>
                      <ATTRIBUTE dmrole="mango:origin.DataOrigin.reference_url" dmtype="ivoa:string" ref="@@@@@" value=""/>
                      <ATTRIBUTE dmrole="mango:origin.DataOrigin.resource_version" dmtype="ivoa:string" ref="@@@@@" value=""/>
@@ -98,7 +108,7 @@ This class specifies both type and role of the  property, and hosts the property
                      <ATTRIBUTE dmrole="mango:origin.DataOrigin.rights_uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
                      <COLLECTION dmrole="mango:origin.DataOrigin.articles">
                         <INSTANCE dmrole="mango:origin.DataOrigin.articles" dmtype="mango:origin.Article">
-                           <!-- Reference article for the \texttt{MangoObject}, usually a bibcode or DOI" -->
+                           <!-- Reference article for the MANGO source" -->
                            <ATTRIBUTE dmrole="mango:origin.Article.editor" dmtype="ivoa:string" ref="@@@@@" value=""/>
                            <ATTRIBUTE dmrole="mango:origin.Article.identifier" dmtype="ivoa:string" ref="@@@@@" value=""/>
                         </INSTANCE>
@@ -109,18 +119,4 @@ This class specifies both type and role of the  property, and hosts the property
          </INSTANCE>
       </INSTANCE>
    </COLLECTION>
-   <INSTANCE dmrole="mango:MangoObject.queryOrigin" dmtype="mango:origin.QueryOrigin">
-      <!-- Description of the query the  \texttt{MangoObject} results from." -->
-      <ATTRIBUTE dmrole="mango:origin.QueryOrigin.publisher" dmtype="ivoa:string" ref="@@@@@" value=""/>
-      <ATTRIBUTE dmrole="mango:origin.QueryOrigin.server_software" dmtype="ivoa:string" ref="@@@@@" value=""/>
-      <ATTRIBUTE dmrole="mango:origin.QueryOrigin.service_protocol" dmtype="ivoa:string" ref="@@@@@" value=""/>
-      <ATTRIBUTE dmrole="mango:origin.QueryOrigin.request" dmtype="ivoa:string" ref="@@@@@" value=""/>
-      <ATTRIBUTE dmrole="mango:origin.QueryOrigin.request_date" dmtype="ivoa:string" ref="@@@@@" value=""/>
-      <ATTRIBUTE dmrole="mango:origin.QueryOrigin.query" dmtype="ivoa:string" ref="@@@@@" value=""/>
-      <ATTRIBUTE dmrole="mango:origin.QueryOrigin.contact" dmtype="ivoa:string" ref="@@@@@" value=""/>
-      <ATTRIBUTE dmrole="mango:origin.QueryOrigin.ivoid" dmtype="ivoa:string" ref="@@@@@" value=""/>
-      <COLLECTION dmrole="mango:origin.QueryOrigin.dataOrigin">
-         <INSTANCE dmtype="mango:origin.DataOrigin"/>
-      </COLLECTION>
-   </INSTANCE>
 </INSTANCE>
diff --git a/mivot/mango/mango.PhysicalProperty.xml b/mivot/mango/mango.PhysicalProperty.xml
index 53998d1..7dd30fd 100644
--- a/mivot/mango/mango.PhysicalProperty.xml
+++ b/mivot/mango/mango.PhysicalProperty.xml
@@ -1,10 +1,11 @@
 <INSTANCE dmrole="" dmtype="mango:PhysicalProperty">
-   <!-- Holder for any quantity that can be modeled by measure classes (Position, Time , Velocity, Polarization, ProperMotion, GenericMeasure) 
-as defined in the \texttt{Astronomical Measurements Model}.
-
-" -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
    <INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">
-      <!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
+      <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
       <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
       <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
    </INSTANCE>
diff --git a/mivot/mango/mango.Property.xml b/mivot/mango/mango.Property.xml
index afd7274..aff0279 100644
--- a/mivot/mango/mango.Property.xml
+++ b/mivot/mango/mango.Property.xml
@@ -1,11 +1,10 @@
 <INSTANCE dmrole="" dmtype="mango:Property">
-   <!-- Class holder for a \textit{flavor} of property, i.e., there should be a Property subclass for each \textit{flavor} 
-of Property being hosted.
-The property types are not limited to &#8220;physical or calculated&#8221; (eg: flags, assigned labels)
-This class specifies both type and role of the  property, and hosts the property instance itself.
-" -->
+   <!-- Reference to a particular measure of the Source.
+This class is used to specify the type of the measure as well as its role." -->
    <INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">
-      <!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
+      <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
       <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
       <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
    </INSTANCE>
diff --git a/mivot/mango/mango.Status.xml b/mivot/mango/mango.Status.xml
index 55fa1a0..cff6329 100644
--- a/mivot/mango/mango.Status.xml
+++ b/mivot/mango/mango.Status.xml
@@ -1,9 +1,11 @@
 <INSTANCE dmrole="" dmtype="mango:Status">
-   <!-- Property representing a status defined by a string (numerical values must be down-casted) 
-that can only take on a defined number of values, each with its own description.
-" -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
    <INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">
-      <!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
+      <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
       <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
       <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
    </INSTANCE>
@@ -13,11 +15,14 @@ that can only take on a defined number of values, each with its own description.
    </COLLECTION>
    <ATTRIBUTE dmrole="mango:Status.status" dmtype="ivoa:string" ref="@@@@@" value=""/>
    <INSTANCE dmrole="mango:Status.allowedValues" dmtype="mango:StatusValues">
-      <!-- Class holder for the list of the allowed values for the status. 
-" -->
+      <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
       <COLLECTION dmrole="mango:StatusValues.values">
          <INSTANCE dmrole="" dmtype="mango:StatusValue">
-            <!-- Value allowed for a status; contains the value with a free text description." -->
+            <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
             <ATTRIBUTE dmrole="mango:StatusValue.value" dmtype="ivoa:string" ref="@@@@@" value=""/>
             <ATTRIBUTE dmrole="mango:StatusValue.description" dmtype="ivoa:string" ref="@@@@@" value=""/>
          </INSTANCE>
diff --git a/mivot/mango/mango.StatusValue.xml b/mivot/mango/mango.StatusValue.xml
index 61bee45..785d85b 100644
--- a/mivot/mango/mango.StatusValue.xml
+++ b/mivot/mango/mango.StatusValue.xml
@@ -1,5 +1,7 @@
 <INSTANCE dmrole="" dmtype="mango:StatusValue">
-   <!-- Value allowed for a status; contains the value with a free text description." -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
    <ATTRIBUTE dmrole="mango:StatusValue.value" dmtype="ivoa:string" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:StatusValue.description" dmtype="ivoa:string" ref="@@@@@" value=""/>
 </INSTANCE>
diff --git a/mivot/mango/mango.StatusValues.xml b/mivot/mango/mango.StatusValues.xml
index 0458822..17ae15c 100644
--- a/mivot/mango/mango.StatusValues.xml
+++ b/mivot/mango/mango.StatusValues.xml
@@ -1,9 +1,12 @@
 <INSTANCE dmrole="" dmtype="mango:StatusValues">
-   <!-- Class holder for the list of the allowed values for the status. 
-" -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
    <COLLECTION dmrole="mango:StatusValues.values">
       <INSTANCE dmrole="" dmtype="mango:StatusValue">
-         <!-- Value allowed for a status; contains the value with a free text description." -->
+         <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
          <ATTRIBUTE dmrole="mango:StatusValue.value" dmtype="ivoa:string" ref="@@@@@" value=""/>
          <ATTRIBUTE dmrole="mango:StatusValue.description" dmtype="ivoa:string" ref="@@@@@" value=""/>
       </INSTANCE>
diff --git a/mivot/mango/mango.VocabularyTerm.xml b/mivot/mango/mango.VocabularyTerm.xml
index 7b5adf3..378a40e 100644
--- a/mivot/mango/mango.VocabularyTerm.xml
+++ b/mivot/mango/mango.VocabularyTerm.xml
@@ -1,5 +1,7 @@
 <INSTANCE dmrole="" dmtype="mango:VocabularyTerm">
-   <!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
    <ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
 </INSTANCE>
diff --git a/mivot/mango/mango.error.PErrorAsym1D.xml b/mivot/mango/mango.error.PErrorAsym1D.xml
index 8b118b9..fd9499f 100644
--- a/mivot/mango/mango.error.PErrorAsym1D.xml
+++ b/mivot/mango/mango.error.PErrorAsym1D.xml
@@ -1,5 +1,7 @@
 <INSTANCE dmrole="" dmtype="mango:error.PErrorAsym1D">
-   <!-- Asymmetrical error for 1D parameters" -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
    <ATTRIBUTE dmrole="mango:error.PropertyError.confidenceLevel" dmtype="ivoa:real" unit="" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:error.PropertyError.distribution" dmtype="ivoa:string" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:error.PErrorAsym1D.high" dmtype="ivoa:RealQuantity" unit="" ref="@@@@@" value=""/>
diff --git a/mivot/mango/mango.error.PErrorEllipse.xml b/mivot/mango/mango.error.PErrorEllipse.xml
index 395d4a9..0683a2f 100644
--- a/mivot/mango/mango.error.PErrorEllipse.xml
+++ b/mivot/mango/mango.error.PErrorEllipse.xml
@@ -1,7 +1,5 @@
 <INSTANCE dmrole="" dmtype="mango:error.PErrorEllipse">
-   <!-- Elliptic error for 2D parameters such as sky positions.
-Major axis and minor axis have their own units, which must be the same for both.
-This is not enforced by the model. The definition of the ellipse attribute is imported from \texttt{coords:Ellipse}. " -->
+   <!-- Elliptical errror for 2D parameters such as the sky positions." -->
    <ATTRIBUTE dmrole="mango:error.PropertyError.confidenceLevel" dmtype="ivoa:real" unit="" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:error.PropertyError.distribution" dmtype="ivoa:string" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:error.PErrorEllipse.semiMajorAxis" dmtype="ivoa:RealQuantity" unit="" ref="@@@@@" value=""/>
diff --git a/mivot/mango/mango.error.PErrorSym1D.xml b/mivot/mango/mango.error.PErrorSym1D.xml
index ade9b45..e4e98a1 100644
--- a/mivot/mango/mango.error.PErrorSym1D.xml
+++ b/mivot/mango/mango.error.PErrorSym1D.xml
@@ -1,5 +1,5 @@
 <INSTANCE dmrole="" dmtype="mango:error.PErrorSym1D">
-   <!-- Symmetrical error for 1D parameters" -->
+   <!-- Symetrical error for 1D parameter." -->
    <ATTRIBUTE dmrole="mango:error.PropertyError.confidenceLevel" dmtype="ivoa:real" unit="" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:error.PropertyError.distribution" dmtype="ivoa:string" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:error.PErrorSym1D.sigma" dmtype="ivoa:RealQuantity" unit="" ref="@@@@@" value=""/>
diff --git a/mivot/mango/mango.error.PErrorSym2D.xml b/mivot/mango/mango.error.PErrorSym2D.xml
index 556d3c3..766e5ff 100644
--- a/mivot/mango/mango.error.PErrorSym2D.xml
+++ b/mivot/mango/mango.error.PErrorSym2D.xml
@@ -1,6 +1,7 @@
 <INSTANCE dmrole="" dmtype="mango:error.PErrorSym2D">
-   <!-- Symmetrical error for 2D quantities. 
-" -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
    <ATTRIBUTE dmrole="mango:error.PropertyError.confidenceLevel" dmtype="ivoa:real" unit="" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:error.PropertyError.distribution" dmtype="ivoa:string" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:error.PErrorSym2D.sigma1" dmtype="ivoa:RealQuantity" unit="" ref="@@@@@" value=""/>
diff --git a/mivot/mango/mango.origin.Article.xml b/mivot/mango/mango.origin.Article.xml
index ad398b7..5eba056 100644
--- a/mivot/mango/mango.origin.Article.xml
+++ b/mivot/mango/mango.origin.Article.xml
@@ -1,5 +1,5 @@
 <INSTANCE dmrole="" dmtype="mango:origin.Article">
-   <!-- Reference article for the \texttt{MangoObject}, usually a bibcode or DOI" -->
+   <!-- Reference article for the MANGO source" -->
    <ATTRIBUTE dmrole="mango:origin.Article.editor" dmtype="ivoa:string" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:origin.Article.identifier" dmtype="ivoa:string" ref="@@@@@" value=""/>
 </INSTANCE>
diff --git a/mivot/mango/mango.origin.DataOrigin.xml b/mivot/mango/mango.origin.DataOrigin.xml
index d0bafb5..43525c1 100644
--- a/mivot/mango/mango.origin.DataOrigin.xml
+++ b/mivot/mango/mango.origin.DataOrigin.xml
@@ -1,6 +1,7 @@
 <INSTANCE dmrole="" dmtype="mango:origin.DataOrigin">
-   <!-- Class representing the description of the origin of the queried dataset.
-" -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
    <ATTRIBUTE dmrole="mango:origin.DataOrigin.ivoid" dmtype="ivoa:string" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:origin.DataOrigin.reference_url" dmtype="ivoa:string" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:origin.DataOrigin.resource_version" dmtype="ivoa:string" ref="@@@@@" value=""/>
diff --git a/mivot/mango/mango.origin.QueryOrigin.xml b/mivot/mango/mango.origin.QueryOrigin.xml
index 1745c53..8490be3 100644
--- a/mivot/mango/mango.origin.QueryOrigin.xml
+++ b/mivot/mango/mango.origin.QueryOrigin.xml
@@ -1,5 +1,7 @@
 <INSTANCE dmrole="" dmtype="mango:origin.QueryOrigin">
-   <!-- Description of the query the  \texttt{MangoObject} results from." -->
+   <!-- 
+          TODO : Missing description : please, update your UML model asap.
+        " -->
    <ATTRIBUTE dmrole="mango:origin.QueryOrigin.publisher" dmtype="ivoa:string" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:origin.QueryOrigin.server_software" dmtype="ivoa:string" ref="@@@@@" value=""/>
    <ATTRIBUTE dmrole="mango:origin.QueryOrigin.service_protocol" dmtype="ivoa:string" ref="@@@@@" value=""/>
diff --git a/utils/processVodml.py b/utils/processVodml.py
index 6a75844..1f036bc 100644
--- a/utils/processVodml.py
+++ b/utils/processVodml.py
@@ -111,7 +111,8 @@ def set_date():
     content = ""
     with open(make_path) as read_file:
         content = read_file.read()
-
+    # REC patch
+    isodate = "2026-04-29"
     content = re.sub("(DOCDATE =) [0-9\-]+", f"\\1 {isodate}", content)
 
     with open(make_path, "w") as write_file:
diff --git a/vo-dml/desc.mango.vo-dml.xml b/vo-dml/desc.mango.vo-dml.xml
index 6d4e05c..21f6df5 100644
--- a/vo-dml/desc.mango.vo-dml.xml
+++ b/vo-dml/desc.mango.vo-dml.xml
@@ -781,7 +781,7 @@ All components use the same coordinate systems for both time and space coordinat
 \end{itemize}
 
 
-It is recommended to use the \texttt{ObsDate} field to store the epoch of the observation instead
+It is recommended to use the \texttt{obsDate} field to store the epoch of the observation instead
 of the \texttt{epoch} field of \texttt{coords:SpaceSys}. 
 There are 2 reasons for this:
 \begin{itemize}