diff --git a/Instrument/AMDA/MAVEN/Ephemeris.xml b/Instrument/AMDA/MAVEN/Ephemeris.xml
index 6c4e090..cd00fe7 100644
--- a/Instrument/AMDA/MAVEN/Ephemeris.xml
+++ b/Instrument/AMDA/MAVEN/Ephemeris.xml
@@ -5,15 +5,19 @@
     <ResourceID>spase://CDPP/Instrument/AMDA/MAVEN/Ephemeris</ResourceID>
     <ResourceHeader>
       <ResourceName>Ephemeris</ResourceName>
-      <AlternateName/>
-      <ReleaseDate>2009-05-20T21:10:13Z</ReleaseDate>
+      <AlternateName>MAVEN Orbit</AlternateName>
+      <ReleaseDate>2016-05-20T21:10:13Z</ReleaseDate>
       <Description/>
       <Contact>       
-        <PersonID/>
+        <PersonID>spase://CDPP/Person/NAIF</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>
+      <Contact>       
+        <PersonID>spase://CDPP/Person/Elena.Budnik</PersonID> 
+        <Role>TechnicalContact</Role>
+      </Contact>
     </ResourceHeader>
-   <InstrumentType>Platform</InstrumentType>
+    <InstrumentType>Platform</InstrumentType>
     <InvestigationName/>
     <ObservatoryID>spase://CDPP/Observatory/AMDA/MAVEN</ObservatoryID>
   </Instrument>
diff --git a/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-cruise.xml b/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-cruise.xml
index fa711a6..ffc75ad 100644
--- a/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-cruise.xml
+++ b/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-cruise.xml
@@ -5,22 +5,26 @@
       <ResourceID>spase://CDPP/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-cruise</ResourceID>
       <ResourceHeader>
          <ResourceName>cruise</ResourceName>
+         <AlternateName>Mission cruise phase</AlternateName>
          <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
          <Description>                        
          </Description>
          <Acknowledgement>            
          </Acknowledgement>
-         <Contact>        
-            <PersonID/>
-            <Role/>
-         </Contact>
-         <InformationURL>
-           <Name/>
-           <URL>              
-           </URL>
+        <Contact>       
+        <PersonID>spase://CDPP/Person/NAIF</PersonID> 
+        <Role>PrincipalInvestigator</Role>
+      </Contact>
+      <Contact>       
+        <PersonID>spase://CDPP/Person/Elena.Budnik</PersonID> 
+        <Role>TechnicalContact</Role>
+      </Contact>
+          <InformationURL>
+           <Name>SPICE description</Name>
+           <URL>http://naif.jpl.nasa.gov/naif/aboutspice.html</URL>
            <Description>             
            </Description>
-         </InformationURL>       
+         </InformationURL>                 
       </ResourceHeader>
       <AccessInformation>
          <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -36,9 +40,10 @@
          <Acknowledgement>           
          </Acknowledgement>
       </AccessInformation>
-      <ProviderName>SPICE/NAIF</ProviderName> 
+      <ProviderName>SPICE/NAIF</ProviderName>
+      <ProviderResourceName>ftp://naif.jpl.nasa.gov/pub/naif/kernels/spk/maven</ProviderResourceName>
       <InstrumentID>spase://CDPP/Instrument/AMDA/MAVEN/Ephemeris</InstrumentID>
-      <MeasurementType/>
+      <MeasurementType>Ephemeris</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
             <StartDate>2013-11-18T19:21:49Z</StartDate>
@@ -54,10 +59,10 @@
          <ParameterKey>mav_xyz_iausun</ParameterKey>
          <Description/>
          <Ucd/>
-         <Units/>
+         <Units>AU</Units>
          <UnitsConversion/>
          <RenderingHints>
-              <DisplayType/>
+              <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>
               <Structure>
                 <Size>3</Size>
@@ -80,16 +85,19 @@
          <ValidMin/>
          <ValidMax/>
          <FillValue/>       
+          <Support>
+              <SupportQuantity>Positional</SupportQuantity>
+          </Support>
       </Parameter> 
-      <Parameter>
-         <Name>xyz_hee</Name>
+       <Parameter>
+           <Name>xyz_hee</Name>
          <ParameterKey>mav_xyz_hee</ParameterKey>
          <Description/>
          <Ucd/>
          <Units/>
          <UnitsConversion/>
          <RenderingHints>
-              <DisplayType/>
+              <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>
               <Structure>
                 <Size>3</Size>
@@ -112,16 +120,19 @@
          <ValidMin/>
          <ValidMax/>
          <FillValue/>       
-      </Parameter>
+           <Support>
+               <SupportQuantity>Other</SupportQuantity>
+           </Support>
+       </Parameter>
        <Parameter>
-         <Name>xyz_heeq</Name>
+           <Name>xyz_heeq</Name>
          <ParameterKey>mav_xyz_heeq</ParameterKey>
          <Description/>
          <Ucd/>
-         <Units/>
+         <Units>AU</Units>
          <UnitsConversion/>
          <RenderingHints>
-              <DisplayType/>
+              <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>
               <Structure>
                 <Size>3</Size>
@@ -144,39 +155,51 @@
          <ValidMin/>
          <ValidMax/>
          <FillValue/>       
-      </Parameter>
-      <Parameter>
-         <Name>distance maven-sun</Name>
+           <Support>
+               <SupportQuantity>Positional</SupportQuantity>
+           </Support>
+       </Parameter>
+       <Parameter>
+           <Name>distance maven-sun</Name>
          <ParameterKey>mav_sun_r</ParameterKey>
          <Description/>
          <Ucd/>
-         <Units/>
+         <Units>AU</Units>
          <UnitsConversion/>
          <RenderingHints>
-              <DisplayType/>
+              <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>              
-      </Parameter> 
-      <Parameter>
-         <Name>lon_iau_sun</Name>
+           <Support>
+               <SupportQuantity>Positional</SupportQuantity>
+           </Support>
+       </Parameter> 
+       <Parameter>
+           <Name>lon_iau_sun</Name>
          <ParameterKey>mav_lon_iausun</ParameterKey>
          <Description/>
          <Ucd/>
-         <Units/>
+         <Units>degrees</Units>
          <UnitsConversion/>
          <RenderingHints>
-              <DisplayType/>
+              <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>
+           <Support>
+               <SupportQuantity>Positional</SupportQuantity>
+           </Support>
        </Parameter>
        <Parameter>
-         <Name>lat_iau_sun</Name>
+           <Name>lat_iau_sun</Name>
          <ParameterKey>mav_lat_iausun</ParameterKey>
          <Description/>
          <Ucd/>
-         <Units/>
+         <Units>degrees</Units>
          <UnitsConversion/>
          <RenderingHints>
-              <DisplayType/>
+              <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>
+           <Support>
+               <SupportQuantity>Positional</SupportQuantity>
+           </Support>
        </Parameter>
-</NumericalData>
+   </NumericalData>
 </Spase>
diff --git a/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml b/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
index 39c13a7..5d9597c 100644
--- a/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
+++ b/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
@@ -10,14 +10,17 @@
          </Description>
          <Acknowledgement>            
          </Acknowledgement>
-         <Contact>        
-            <PersonID/>
-            <Role/>
-         </Contact>
+          <Contact>       
+        <PersonID>spase://CDPP/Person/NAIF</PersonID> 
+        <Role>PrincipalInvestigator</Role>
+      </Contact>
+      <Contact>       
+        <PersonID>spase://CDPP/Person/Elena.Budnik</PersonID> 
+        <Role>TechnicalContact</Role>
+      </Contact> 
          <InformationURL>
-           <Name/>
-           <URL>              
-           </URL>
+           <Name>SPICE description</Name>
+           <URL>http://naif.jpl.nasa.gov/naif/aboutspice.html</URL>
            <Description>             
            </Description>
          </InformationURL>       
@@ -32,13 +35,14 @@
                 http://amda.cdpp.eu
             </URL>
          </AccessURL>
-         <Format/>
+         <Format>Text.ASCII</Format>
          <Acknowledgement>           
          </Acknowledgement>
       </AccessInformation>
       <ProviderName>SPICE/NAIF</ProviderName> 
+      <ProviderResourceName>ftp://naif.jpl.nasa.gov/pub/naif/kernels/spk/maven</ProviderResourceName>
       <InstrumentID>spase://CDPP/Instrument/AMDA/MAVEN/Ephemeris</InstrumentID>
-      <MeasurementType/>
+      <MeasurementType>Ephemeris</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
             <StartDate>2014-06-01T00:00:00Z</StartDate>
@@ -54,10 +58,10 @@
          <ParameterKey>mav_xyz_iaumars</ParameterKey>
          <Description/>
          <Ucd/>
-         <Units/>
+         <Units>Rma</Units>
          <UnitsConversion/>
          <RenderingHints>
-              <DisplayType/>
+              <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>
               <Structure>
                 <Size>3</Size>
@@ -80,16 +84,19 @@
          <ValidMin/>
          <ValidMax/>
          <FillValue/>       
+          <Support>
+              <SupportQuantity>Positional</SupportQuantity>
+          </Support>
       </Parameter> 
-      <Parameter>
-         <Name>xyz_mso</Name>
+       <Parameter>
+          <Name>xyz_mso</Name>
          <ParameterKey>mav_xyz_mso</ParameterKey>
          <Description/>
          <Ucd/>
-         <Units/>
+         <Units>Rma</Units>
          <UnitsConversion/>
          <RenderingHints>
-              <DisplayType/>
+              <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>
               <Structure>
                 <Size>3</Size>
@@ -112,39 +119,51 @@
          <ValidMin/>
          <ValidMax/>
          <FillValue/>       
-      </Parameter> 
-      <Parameter>
-         <Name>distance maven-mars</Name>
+           <Support>
+               <SupportQuantity>Positional</SupportQuantity>
+           </Support>
+       </Parameter> 
+       <Parameter>
+           <Name>distance maven-mars</Name>
          <ParameterKey>mav_mars_r</ParameterKey>
          <Description/>
          <Ucd/>
-         <Units>Rm</Units>
+         <Units>Rma</Units>
          <UnitsConversion/>
          <RenderingHints>
-              <DisplayType/>
+              <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>              
-      </Parameter> 
-      <Parameter>
-         <Name>lon_iau_mars</Name>
+           <Support>
+               <SupportQuantity>Positional</SupportQuantity>
+           </Support>
+       </Parameter> 
+       <Parameter>
+           <Name>lon_iau_mars</Name>
          <ParameterKey>mav_lon_iaumars</ParameterKey>
          <Description/>
          <Ucd/>
-         <Units/>
+         <Units>degrees</Units>
          <UnitsConversion/>
          <RenderingHints>
-              <DisplayType/>
+              <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>
+           <Support>
+               <SupportQuantity>Positional</SupportQuantity>
+           </Support>
        </Parameter>
        <Parameter>
-         <Name>lat_iau_mars</Name>
+          <Name>lat_iau_mars</Name>
          <ParameterKey>mav_lat_iaumars</ParameterKey>
          <Description/>
          <Ucd/>
-         <Units/>
+         <Units>degrees</Units>
          <UnitsConversion/>
          <RenderingHints>
-              <DisplayType/>
+              <DisplayType>TimeSeries</DisplayType>
          </RenderingHints>
+           <Support>
+               <SupportQuantity>Positional</SupportQuantity>
+           </Support>
        </Parameter>
-</NumericalData>
+   </NumericalData>
 </Spase>
diff --git a/Person/NAIF b/Person/NAIF
new file mode 100644
index 0000000..aee4d8e
--- /dev/null
+++ b/Person/NAIF
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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_0.xsd">
+  <Version>2.2.0</Version>
+  <Person>
+    <ResourceID>spase://CDPP/Person/NAIF</ResourceID>
+    <PersonName>Navigation and Ancillary Information Facility</PersonName>
+    <OrganizationName>NASA JPL</OrganizationName>
+    <Email>http://naif.jpl.nasa.gov/naif/contactinfo.html</Email>
+  </Person>
+</Spase>
--
libgit2 0.21.2