diff --git a/NumericalData/AMDA/MEX/ephemeris/mex-orb-all.xml b/NumericalData/AMDA/MEX/ephemeris/mex-orb-all.xml
deleted file mode 100644
index 36b8159..0000000
--- a/NumericalData/AMDA/MEX/ephemeris/mex-orb-all.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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://cdpp.irap.omp.eu/AMDA-NG/public/schemas/spase-amda-1_2_0.xsd">
-    <Version>2.2.6</Version>
-    <NumericalData>
-        <ResourceID>spase://CDPP/NumericalData/AMDA/MEX/ephemeris/mex-orb-all</ResourceID>
-        <ResourceHeader>
-            <ResourceName>orbit mars</ResourceName>
-            <ReleaseDate>2017-01-15T10:17:29Z</ReleaseDate>
-            <Description>Orbital data are calculated based on SPICE kernels</Description>
-            <Contact>
-                <PersonID>spase://CDPP/Person/Peje.Nilsson</PersonID>
-                <Role>TechnicalContact</Role>
-            </Contact>
-            <Contact>
-                <PersonID>spase://CDPP/Person/Elena.Budnik</PersonID>
-                <Role>TechnicalContact</Role>
-            </Contact>
-           <InformationURL>
-               <Name>IRF : Access URL</Name>
-               <URL>http://rhea.umea.irf.se/~peje/mex/orbit_plots/</URL>
-               <Description>            
-               </Description>
-         </InformationURL>  
-        </ResourceHeader>
-        <AccessInformation>
-            <RepositoryID>spase://CDPP/Repository/AMDA</RepositoryID>
-            <Availability>Online</Availability>
-            <AccessRights>Open</AccessRights>
-            <AccessURL>
-                <URL>http://amda.cdpp.eu</URL>
-            </AccessURL>
-            <Format>NetCDF</Format>
-        </AccessInformation>
-        <ProviderName>IRF, Sweden</ProviderName>
-        <InstrumentID>spase://CDPP/Instrument/AMDA/MEX/ephemeris</InstrumentID>
-        <MeasurementType>Ephemeris</MeasurementType>
-        <TemporalDescription>
-            <TimeSpan>
-                <StartDate>2004-01-10T07:54:21Z</StartDate>
-                <StopDate>2017-07-13T02:41:34Z</StopDate>
-            </TimeSpan>
-            <Cadence>PT60S</Cadence>
-        </TemporalDescription>
-        <ObservedRegion>Mars</ObservedRegion>      
-        <Parameter>
-            <Name>xyz_mso</Name>
-            <ParameterKey>mex_xyz</ParameterKey>
-            <Description>Mars Express trajectory in MSO coordinates</Description>
-            <Ucd>pos.bodyrc;instr.obsty</Ucd>
-            <Units>Rma</Units>
-             <UnitsConversion>3.396e6</UnitsConversion>
-            <CoordinateSystem>
-                <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
-                <CoordinateSystemName>MSO</CoordinateSystemName>
-            </CoordinateSystem>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size>3</Size>
-                <Element>
-                    <Name>x</Name>
-                    <Index>1</Index>
-                    <ParameterKey>mex_xyz(0)</ParameterKey>
-                </Element>
-                <Element>
-                    <Name>y</Name>
-                    <Index>2</Index>
-                    <ParameterKey>mex_xyz(1)</ParameterKey>
-                </Element>
-                <Element>
-                    <Name>z</Name>
-                    <Index>3</Index>
-                    <ParameterKey>mex_xyz(2)</ParameterKey>
-                </Element>
-            </Structure>
-            <Support>
-                <SupportQuantity>Positional</SupportQuantity>
-            </Support>
-        </Parameter>
-        <Parameter>
-            <Name>distance mex-mars</Name>
-            <ParameterKey>pol_mex_pc(0)</ParameterKey>
-            <Description>Mars Express trajectory in PC coordinates</Description>
-            <Ucd>pos.bodyrc;instr.obsty</Ucd>
-            <Units>Rma</Units> 
-            <Support>
-                <SupportQuantity>Positional</SupportQuantity>
-            </Support>
-        </Parameter>
-         <Parameter>
-            <Name>lon_iau_mars</Name>
-            <ParameterKey>pol_mex_pc(1)</ParameterKey>
-            <Description>Mars Express trajectory in PC coordinates</Description>
-            <Ucd>pos.bodyrc;instr.obsty</Ucd>
-            <Units>deg</Units> 
-            <Support>
-                <SupportQuantity>Positional</SupportQuantity>
-            </Support>
-        </Parameter>  
-        <Parameter>
-            <Name>lat_iau_mars</Name>
-            <ParameterKey>pol_mex_pc(2)</ParameterKey>
-            <Description>Mars Express trajectory in PC coordinates</Description>
-            <Ucd>pos.bodyrc;instr.obsty</Ucd>
-            <Units>deg</Units> 
-            <Support>
-                <SupportQuantity>Positional</SupportQuantity>
-            </Support>
-        </Parameter>
-     </NumericalData>
-</Spase>
diff --git a/NumericalData/AMDA/MEX/ephemeris/mex-orb-mars.xml b/NumericalData/AMDA/MEX/ephemeris/mex-orb-mars.xml
new file mode 100644
index 0000000..317c024
--- /dev/null
+++ b/NumericalData/AMDA/MEX/ephemeris/mex-orb-mars.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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://cdpp.irap.omp.eu/AMDA-NG/public/schemas/spase-amda-1_2_0.xsd">
+    <Version>2.2.6</Version>
+    <NumericalData>
+        <ResourceID>spase://CDPP/NumericalData/AMDA/MEX/ephemeris/mex-orb-mars</ResourceID>
+        <ResourceHeader>
+            <ResourceName>orbit mars (spice)</ResourceName>
+            <ReleaseDate>2017-01-15T10:17:29Z</ReleaseDate>
+            <Description>Orbital data are calculated based on SPICE kernels</Description>
+            
+            <Contact>
+                <PersonID>spase://CDPP/Person/Elena.Budnik</PersonID>
+                <Role>TechnicalContact</Role>
+            </Contact>
+           <InformationURL>
+               <Name></Name>
+               <URL></URL>
+               <Description>            
+               </Description>
+         </InformationURL>  
+        </ResourceHeader>
+        <AccessInformation>
+            <RepositoryID>spase://CDPP/Repository/AMDA</RepositoryID>
+            <Availability>Online</Availability>
+            <AccessRights>Open</AccessRights>
+            <AccessURL>
+                <URL>http://amda.cdpp.eu</URL>
+            </AccessURL>
+            <Format>NetCDF</Format>
+        </AccessInformation>
+        <ProviderName></ProviderName>
+        <InstrumentID>spase://CDPP/Instrument/AMDA/MEX/ephemeris</InstrumentID>
+        <MeasurementType>Ephemeris</MeasurementType>
+        <TemporalDescription>
+            <TimeSpan>
+                <StartDate>2004-01-10T07:54:21Z</StartDate>
+                <StopDate>2017-09-04T03:50:22Z</StopDate>
+            </TimeSpan>
+            <Cadence>PT60S</Cadence>
+        </TemporalDescription>
+        <ObservedRegion>Mars</ObservedRegion>      
+        <Parameter>
+            <Name>xyz_mso</Name>
+            <ParameterKey>mex_xyz_mso</ParameterKey>
+            <Description>Mars Express trajectory in MSO coordinates</Description>
+            <Ucd>pos.bodyrc;instr.obsty</Ucd>
+            <Units>Rma</Units>
+             <UnitsConversion>3.396e6</UnitsConversion>
+            <CoordinateSystem>
+                <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
+                <CoordinateSystemName>MSO</CoordinateSystemName>
+            </CoordinateSystem>
+            <RenderingHints>
+                <DisplayType>TimeSeries</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size>3</Size>
+                <Element>
+                    <Name>x</Name>
+                    <Index>1</Index>
+                    <ParameterKey>mex_xyz_mso(0)</ParameterKey>
+                </Element>
+                <Element>
+                    <Name>y</Name>
+                    <Index>2</Index>
+                    <ParameterKey>mex_xyz_mso(1)</ParameterKey>
+                </Element>
+                <Element>
+                    <Name>z</Name>
+                    <Index>3</Index>
+                    <ParameterKey>mex_xyz_mso(2)</ParameterKey>
+                </Element>
+            </Structure>
+            <Support>
+                <SupportQuantity>Positional</SupportQuantity>
+            </Support>
+        </Parameter>
+        <Parameter>
+            <Name>distance mex-mars</Name>
+            <ParameterKey>mex_mars_r</ParameterKey>
+            <Description>Mars Express trajectory in PC coordinates</Description>
+            <Ucd>pos.bodyrc;instr.obsty</Ucd>
+            <Units>Rma</Units> 
+            <Support>
+                <SupportQuantity>Positional</SupportQuantity>
+            </Support>
+        </Parameter>
+         <Parameter>
+            <Name>lon_iau_mars</Name>
+            <ParameterKey>lon_mex_iau</ParameterKey>
+            <Description>Mars Express trajectory in PC coordinates</Description>
+            <Ucd>pos.bodyrc;instr.obsty</Ucd>
+            <Units>deg</Units> 
+            <Support>
+                <SupportQuantity>Positional</SupportQuantity>
+            </Support>
+        </Parameter>  
+        <Parameter>
+            <Name>lat_iau_mars</Name>
+            <ParameterKey>lat_mex_iau</ParameterKey>
+            <Description>Mars Express trajectory in PC coordinates</Description>
+            <Ucd>pos.bodyrc;instr.obsty</Ucd>
+            <Units>deg</Units> 
+            <Support>
+                <SupportQuantity>Positional</SupportQuantity>
+            </Support>
+        </Parameter>
+     </NumericalData>
+</Spase>
--
libgit2 0.21.2