diff --git a/Instrument/AMDA/VEX/IMA.xml b/Instrument/AMDA/VEX/IMA.xml
index 70f6115..bb518c1 100644
--- a/Instrument/AMDA/VEX/IMA.xml
+++ b/Instrument/AMDA/VEX/IMA.xml
@@ -2,11 +2,11 @@
 <Spase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.spase-group.org/data/schema" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2_2_6.xsd">
   <Version>2.2.6</Version>
   <Instrument>
-    <ResourceID>spase://CDPP/Instrument/AMDA/VEX/IMA</ResourceID>
+    <ResourceID>spase://CDPP/Instrument/AMDA/VEX/IMA</ResourceID><!--- don't modify -->
     <ResourceHeader>
-      <ResourceName>IMA</ResourceName>
-      <AlternateName>Ion Mass Analyzer</AlternateName>
-      <ReleaseDate>2012-06-13T00:00:00Z</ReleaseDate>
+      <ResourceName>IMA</ResourceName><!-- don't modify : shown as instrument node name in the AMDA tree -->
+      <AlternateName>Ion Mass Analyzer</AlternateName><!-- shown in instrument tooltip in the AMDA tree -->
+      <ReleaseDate>2016-07-10T00:00:00Z</ReleaseDate><!--- current date -->
       <Description>The Ion Mass Analyzer (IMA) of the ASPERA-4 package
 flown on Venus Express provides ion measurements in the energy range 
 0.01 - 36 keV/q for the main ion components H+, H2+, He+, O+, and for the 
@@ -14,18 +14,29 @@ group of molecular ions with M/q ration between 20 and 80 amu/e. IMA has a 90 de
 of view. Electrostatic sweeping performs elevation (+/- 45 deg) coverage. 
 The IMA sensor is a spherical electrostatic analyzer followed by a circular 
 magnetic separating section. A large diameter MCP with a discrete anode images 
-the matrix azimuth x mass.</Description>
-      <Contact>
+the matrix azimuth x mass.</Description><!--- AMDA help -->
+      <Acknowledgement>Principal Investigator: Stas Barabash, IRF, Kiruna</Acknowledgement>
+      <Contact><!--- multiple tags possible -->
         <PersonID>spase://SMWG/Person/Stas.Barabash</PersonID>
         <Role>PrincipalInvestigator</Role>
-      </Contact>
+      </Contact><!--- AMDA help -->
       <InformationURL>
-        <Name>PSA ASPERA web page</Name>
-        <URL>ftp://psa.esac.esa.int/pub/mirror/VENUS-EXPRESS/ASPERA4/VEX-V-SW-ASPERA-2-ELS-V1.0/CATALOG/INST.CAT</URL>
+        <Name>ASPERA web page, IRF, Kiruna</Name><!--- AMDA help -->
+        <URL>http://www.irf.sw/aspera-4</URL><!--- AMDA help -->
+      </InformationURL>
+      <InformationURL>
+        <Name>VEX IMA/ELS Inventory Graph, IRAP, Toulouse</Name>
+        <URL>http://goezogt.cesr.fr/DD_VEX/inventory.html</URL>
       </InformationURL>
     </ResourceHeader>
-    <InstrumentType>MassSpectrometer</InstrumentType>
-    <InvestigationName>ASPERA4</InvestigationName>
-    <ObservatoryID>spase://CDPP/Observatory/AMDA/VEX</ObservatoryID>
+    <InstrumentType>MassSpectrometer</InstrumentType><!-- shown in instrument tooltip in the AMDA tree ; multiple tags possible-->
+    <InvestigationName>ASPERA4</InvestigationName><!--- consortium, group of instruments, if exists -->
+    <OperatingSpan>
+      <StartDate>2006-05-14T00:00:00Z</StartDate>
+      <StopDate>2014-11-27T07:00:00Z</StopDate>
+      <Note>Data Gap : 2014-10-13T00:00:00Z - 2014-11-07T00:00:00Z</Note><!--- if possible note large data gaps; multiple Note tags -->
+    </OperatingSpan><!-- shown in instrument tooltip in the AMDA tree -->
+    <ObservatoryID>spase://CDPP/Observatory/AMDA/VEX</ObservatoryID><!--- don't modify -->
+    <Caveats></Caveats><!--- AMDA help, if exists -->
   </Instrument>
 </Spase>
diff --git a/NumericalData/AMDA/MAVEN/MAG/mav-mag-pds.xml b/NumericalData/AMDA/MAVEN/MAG/mav-mag-pds.xml
index d838ce3..aba8d51 100644
--- a/NumericalData/AMDA/MAVEN/MAG/mav-mag-pds.xml
+++ b/NumericalData/AMDA/MAVEN/MAG/mav-mag-pds.xml
@@ -11,7 +11,7 @@
          <Acknowledgement>            
          </Acknowledgement>
          <Contact>        
-            <PersonID>John Connerney (GSFC)</PersonID>
+            <PersonID>John Connerney</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
@@ -36,7 +36,9 @@
          <Acknowledgement>           
          </Acknowledgement>
       </AccessInformation>
-      <ProviderName/> 
+      <ProviderName>PDS</ProviderName> 
+      <ProviderResourceName></ProviderResourceName>
+      <ProviderAcknowlegment></ProviderAcknowlegment>
       <InstrumentID>spase://CDPP/Instrument/AMDA/MAVEN/MAG</InstrumentID>
       <MeasurementType>MagneticField</MeasurementType>
       <TemporalDescription>
@@ -44,7 +46,8 @@
              <StartDate>2014-10-10T00:00:00Z</StartDate>
              <StopDate>2016-02-15T00:00:02Z</StopDate>
          </TimeSpan>
-      <Cadence_Min>PT0.031S</Cadence_Min><Cadence_Max>PT8S</Cadence_Max></TemporalDescription>
+        <Cadence>PT0.031S</Cadence>     
+      </TemporalDescription>
       <ObservedRegion>Mars</ObservedRegion>
       <Caveats>
       </Caveats>    
@@ -131,6 +134,9 @@
          <Ucd/>
          <Units>nT</Units>
          <UnitsConversion/>
+         <ValidMin/>
+         <ValidMax/>
+         <FillValue/>
       </Parameter>
    </NumericalData>
 </Spase>
diff --git a/NumericalData/AMDA/VEX/IMA/vex-ima-param.xml b/NumericalData/AMDA/VEX/IMA/vex-ima-param.xml
index 5e259e9..70746d5 100644
--- a/NumericalData/AMDA/VEX/IMA/vex-ima-param.xml
+++ b/NumericalData/AMDA/VEX/IMA/vex-ima-param.xml
@@ -2,18 +2,23 @@
 <Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://cdpp1.cesr.fr/AMDA-NG/public/schemas/spase-amda-1_2_0.xsd">
     <Version>2.2.6</Version>
     <NumericalData>
-        <ResourceID>spase://CDPP/NumericalData/AMDA/VEX/IMA/vex-ima-param</ResourceID>
+        <ResourceID>spase://CDPP/NumericalData/AMDA/VEX/IMA/vex-ima-param</ResourceID><!--- don't modify -->
         <ResourceHeader>
-            <ResourceName>imaextra moments</ResourceName>
+            <ResourceName>imaextra moments</ResourceName><!-- shown as dataset node name in the AMDA tree -->
             <ReleaseDate>2015-10-13T17:08:00</ReleaseDate>
             <Description>Venux Express (VEX) ASPERA-4 Ion Mass Analyzer (IMA) data (moments)
-                Preliminary data obtained from Andrei Fedorov (IRAP)</Description>
+                Calculated using Andrei Fedorov (IRAP) procedure</Description><!--- AMDA help -->
+            <Acknowledgement>Principal Invistigator : Stas Barabash, IRF, Kiruna</Acknowledgement>
             <Contact>
-                <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://SMWG/Person/Stas.Barabash</PersonID>
+                <Role>PrincipalInvestigator</Role>
+            </Contact><!--- AMDA help -->
+            <Contact>
+                <PersonID>spase://SMWG/Person/Andrey.Fedorov</PersonID>
                 <Role>GeneralContact</Role>
-            </Contact>
+            </Contact><!--- AMDA help -->
         </ResourceHeader>
-        <AccessInformation>
+        <AccessInformation><!--- CDPP team to fill -->
             <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
             <Availability>Online</Availability>
             <AccessRights>Open</AccessRights>
@@ -21,40 +26,53 @@
                 <URL>http://amda.cdpp.eu</URL>
             </AccessURL>
             <Format>NetCDF</Format>
+            <Acknowledgement>AMDA is a science analysis system provided by the Centre de Donnees de la 
+                Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and 
+                Universite Paul Sabatier, Toulouse</Acknowledgement>
         </AccessInformation>
-        <ProviderName>IRAP</ProviderName>
-        <InstrumentID>spase://CDPP/Instrument/AMDA/VEX/IMA</InstrumentID>
-        <MeasurementType>EnergeticParticles</MeasurementType>
-        <TemporalDescription>
+        <ProviderName>IRAP, Toulouse</ProviderName><!--- CDPP team to fill -->
+        <ProviderResourceName></ProviderResourceName><!--- CDPP team to fill -->
+        <ProviderAcknowlegment></ProviderAcknowlegment><!--- CDPP team to fill -->
+        <ProviderProcessingLevel>Final</ProviderProcessingLevel><!--- CDPP team to fill -->
+        <InstrumentID>spase://CDPP/Instrument/AMDA/VEX/IMA</InstrumentID><!--- don't modify -->
+        <MeasurementType>IonComposition</MeasurementType>
+        <TemporalDescription><!--- don't modify -->
             <TimeSpan>
                 <StartDate>2006-05-14T02:58:08Z</StartDate>
                 <StopDate>2014-11-27T09:21:53Z</StopDate>
             </TimeSpan>
             <Cadence>PT192S</Cadence>
         </TemporalDescription>
-        <ObservedRegion>Venus</ObservedRegion>
+        <ObservedRegion>Venus</ObservedRegion><!--- First item - principal target (used in AMDA filtering) -->  
+        <ObservedRegion>Venus.Magnetosphere</ObservedRegion>
+        <ObservedRegion>Heliosphere.Inner</ObservedRegion>
+        <Caveats></Caveats><!--- AMDA Help, if exists -->
         <Parameter>
-            <Name>protons: moments quality</Name>
-            <ParameterKey>vex_h_qual</ParameterKey>
-            <Description>Proton moment quality flag</Description>
+            <Name>protons: moments quality</Name><!-- shown as parameter name in the AMDA tree -->
+            <ParameterKey>vex_h_qual</ParameterKey><!--- don't modify -->
+            <Description>Proton moments quality flag</Description>
             <Ucd>meta.code.qual;phys.atmol.ionStage</Ucd>
-            <Units>0-1</Units>
+            <Units>0-1</Units><!-- shown in parameter tooltip in the AMDA tree -->
             <RenderingHints>
                 <DisplayType>TimeSeries</DisplayType>
             </RenderingHints>
+            <ValidMin>0</ValidMin>
+            <ValidMax>1</ValidMax>
             <Support>
                 <SupportQuantity>Other</SupportQuantity>
-            </Support>
+            </Support>         
         </Parameter>
         <Parameter>
             <Name>heavy: moments quality</Name>
             <ParameterKey>vex_o_qual</ParameterKey>
-            <Description>Heavy ion moment quality flag</Description>
+            <Description>Heavy ion moments quality flag</Description>
             <Ucd>meta.code.qual;phys.atmol.ionStage</Ucd>
             <Units>0-1</Units>
             <RenderingHints>
                 <DisplayType>TimeSeries</DisplayType>
             </RenderingHints>
+            <ValidMin>0</ValidMin>
+            <ValidMax>1</ValidMax>
             <Support>
                 <SupportQuantity>Other</SupportQuantity>
             </Support>
@@ -68,6 +86,9 @@
             <RenderingHints>
                 <DisplayType>TimeSeries</DisplayType>
             </RenderingHints>
+            <ValidMin></ValidMin>
+            <ValidMax></ValidMax>
+            <FillValue></FillValue>
             <Particle>
                 <ParticleType>Proton</ParticleType>
                 <ParticleQuantity>NumberDensity</ParticleQuantity>
@@ -79,6 +100,8 @@
             <Description>Heavy ion density</Description>
             <Ucd>phys.density;phys.atmol.ionStage</Ucd>
             <Units>cm-3</Units>
+            <UnitsConversion></UnitsConversion>
+            
             <RenderingHints>
                 <DisplayType>TimeSeries</DisplayType>
             </RenderingHints>
@@ -105,8 +128,9 @@
             <Name>heavy: temperature</Name>
             <ParameterKey>vex_o_temp</ParameterKey>
             <Description>Heavy ion temperature</Description>
-            <Ucd>phys.temperature;phys.atmol.ionStage</Ucd>
+            <Ucd>phys.temperature;phys.atmol.ionStage</Ucd>           
             <Units>eV</Units>
+            <UnitsConversion></UnitsConversion>
             <RenderingHints>
                 <DisplayType>TimeSeries</DisplayType>
             </RenderingHints>
@@ -121,31 +145,42 @@
             <Description>Proton bulk velocity components in VSO coordinates</Description>
             <Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
             <Units>km/s</Units>
+            <UnitsConversion></UnitsConversion>
+            <CoordinateSystem>
+                <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
+                <CoordinateSystemName>VSO</CoordinateSystemName>
+            </CoordinateSystem>
             <RenderingHints>
                 <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
+            </RenderingHints>          
             <Structure>
                 <Size>3</Size>
                 <Element>
-                    <Name>vx</Name>
+                    <Name>vx</Name><!-- shown as parameter component name in the AMDA tree -->
                     <Index>0</Index>
-                    <ParameterKey>vex_h_vel(0)</ParameterKey>
+                    <ParameterKey>vex_h_vel(0)</ParameterKey><!--- don't modify -->
+                    <ValidMin></ValidMin>
+                    <ValidMax></ValidMax>
                 </Element>
                 <Element>
                     <Name>vy</Name>
                     <Index>1</Index>
                     <ParameterKey>vex_h_vel(1)</ParameterKey>
+                    <ValidMin></ValidMin>
+                    <ValidMax></ValidMax>
                 </Element>
                 <Element>
                     <Name>vz</Name>
                     <Index>2</Index>
                     <ParameterKey>vex_h_vel(2)</ParameterKey>
+                    <ValidMin></ValidMin>
+                    <ValidMax></ValidMax>
                 </Element>
             </Structure>
             <Particle>
                 <ParticleType>Proton</ParticleType>
                 <ParticleQuantity>Velocity</ParticleQuantity>
-            </Particle>
+            </Particle>           
          </Parameter>
         <Parameter>
             <Name>heavy: v_vso</Name>
@@ -153,6 +188,11 @@
             <Description>Heavy ion bulk velocity components in VSO coordinates</Description>
             <Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
             <Units>km/s</Units>
+            <UnitsConversion></UnitsConversion>
+            <CoordinateSystem>
+                <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
+                <CoordinateSystemName>VSO</CoordinateSystemName>
+            </CoordinateSystem>
             <RenderingHints>
                 <DisplayType>TimeSeries</DisplayType>
             </RenderingHints>
@@ -182,7 +222,7 @@
         <Parameter>
             <Name>scan flag</Name>
             <ParameterKey>vex_scan</ParameterKey>
-            <Description>Scan quality flag</Description>
+            <Description>Scan flag : 0 - no scanning; 1 - scanning</Description>
             <Ucd>meta.code.qual</Ucd>
             <Support>
                 <SupportQuantity>Other</SupportQuantity>
diff --git a/Observatory/AMDA/VEX.xml b/Observatory/AMDA/VEX.xml
index addf5d7..9ed2478 100644
--- a/Observatory/AMDA/VEX.xml
+++ b/Observatory/AMDA/VEX.xml
@@ -12,14 +12,13 @@
         It arrived at Venus in April 2006 and continued operating for more than eight years.
       </Description><!--- AMDA help -->
       <Acknowledgement>ESA</Acknowledgement><!--- AMDA help -->
-      <Contact><!--- AMDA help (info will be get from SMWG by PersonID) -->     
+      <Contact><!--- AMDA help (info will be get from SMWG by PersonID) ; multiple tags possible -->     
         <PersonID>spase://SMWG/Person/Hakan.Svedhem</PersonID>
         <Role>ProjectScientist</Role>
       </Contact> 
-      <InformationURL>
-        <Name>VEX home page</Name>
-        <URL>http://sci.esa.int/venus-express</URL><!--- AMDA help -->
-        <Description>VEX home page at ESA</Description>
+      <InformationURL><!--- multiple tags possible -->
+        <Name>VEX home page at ESA</Name><!--- AMDA help -->
+        <URL>http://sci.esa.int/venus-express</URL><!--- AMDA help -->      
       </InformationURL>      
     </ResourceHeader>
     <Location> 
@@ -29,7 +28,7 @@
     <OperatingSpan><!-- shown in mission tooltip in the AMDA tree -->
       <StartDate>2005-11-09T03:33:00</StartDate>
       <StopDate>2014-12-16T00:00:00</StopDate>
-      <Note>Venus arrival : 2006-04-11T00:00:00</Note><!--- Mission phases : multiple Note tags are possible -->
-    </OperatingSpan>    
+      <Note>Venus arrival : 2006-04-11T00:00:00</Note><!--- Mission phases : multiple Note tags possible -->
+    </OperatingSpan>  
   </Observatory>
 </Spase>
--
libgit2 0.21.2