diff --git a/NumericalData/AMDA/Juno/Ephemeris/juno-cruise-all.xml b/NumericalData/AMDA/Juno/Ephemeris/juno-cruise-all.xml
index 51e6588..5e34548 100644
--- a/NumericalData/AMDA/Juno/Ephemeris/juno-cruise-all.xml
+++ b/NumericalData/AMDA/Juno/Ephemeris/juno-cruise-all.xml
@@ -5,21 +5,17 @@
       <ResourceID>spase://CDPP/NumericalData/AMDA/Juno/ephemeris/juno-cruise-all</ResourceID>
       <ResourceHeader>
          <ResourceName>cruise</ResourceName>
-         <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
-         <Description>                        
-         </Description>
-         <Acknowledgement>            
-         </Acknowledgement>
-         <Contact>        
-            <PersonID/>
-            <Role/>
-         </Contact>
+         <ReleaseDate>2017-01-12T10:48:29Z</ReleaseDate>
+         <Description/>                                 
+         <Acknowledgement/>
+         <Contact>
+            <PersonID>spase://CDPP/Person/NAIF</PersonID>
+            <Role>PrincipalInvestigator</Role>
+         </Contact> 
          <InformationURL>
            <Name/>
-           <URL>              
-           </URL>
-           <Description>             
-           </Description>
+           <URL/>                         
+           <Description/>                        
          </InformationURL>       
       </ResourceHeader>
       <AccessInformation>
@@ -48,36 +44,76 @@
       <ObservedRegion>Heliosphere</ObservedRegion>
       <Caveats>
       </Caveats>    
-<Parameter>
-   <Name>xyz_iau_sun</Name>
-   <ParameterKey>juno_cruise_xyz</ParameterKey><Description/>
-   <Ucd/><Units>AU</Units><UnitsConversion/>
-   <Structure><Size>3</Size><Element><Name>x</Name><Qualifier/>
-      <Index/><ParameterKey>juno_cruise_xyz(0)</ParameterKey>
-      <ValidMin/><ValidMax/><FillValue/></Element>
-      <Element><Name>y</Name><Qualifier/><Index/>
-         <ParameterKey>juno_cruise_xyz(1)</ParameterKey>
-         <ValidMin/><ValidMax/><FillValue/>
-      </Element>
-      <Element><Name>z</Name><Qualifier/>
-         <Index/><ParameterKey>juno_cruise_xyz(2)</ParameterKey>
-         <ValidMin/><ValidMax/><FillValue/>
-      </Element></Structure>
-</Parameter>
+      <Parameter>
+         <Name>xyz_iau_sun</Name>
+         <ParameterKey>juno_cruise_xyz</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units>AU</Units>
+         <UnitsConversion/>
+         <Structure>
+            <Size>3</Size>
+            <Element>
+               <Name>x</Name>
+               <Qualifier>Component.I</Qualifier>
+               <Index>1</Index>
+               <ParameterKey>juno_cruise_xyz(0)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+            <Element>
+               <Name>y</Name>
+               <Qualifier>Component.J</Qualifier>
+               <Index>2</Index>
+               <ParameterKey>juno_cruise_xyz(1)</ParameterKey>
+               <ValidMin/><ValidMax/><FillValue/>
+            </Element>
+            <Element>
+               <Name>z</Name>
+               <Qualifier>Component.K</Qualifier>
+               <Index>3</Index>
+               <ParameterKey>juno_cruise_xyz(2)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+         </Structure>
+         <Support>
+            <SupportQuantity>Positional</SupportQuantity>
+         </Support>
+      </Parameter>
       <Parameter>
          <Name>distance juno-sun</Name>
          <ParameterKey>juno_cruise_r</ParameterKey>
-         <Description/><Ucd/><Units>AU</Units><UnitsConversion/>
+         <Description/>
+         <Ucd/>
+         <Units>AU</Units>
+         <UnitsConversion/>
+         <Support>
+            <SupportQuantity>Positional</SupportQuantity>
+         </Support>
       </Parameter>
       <Parameter>
          <Name>lon_iau_sun</Name>
-         <ParameterKey>juno_cruise_lon</ParameterKey><Description/>
-         <Ucd/><Units>deg</Units><UnitsConversion/>
+         <ParameterKey>juno_cruise_lon</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units>deg</Units><UnitsConversion/>
+         <Support>
+            <SupportQuantity>Positional</SupportQuantity>
+         </Support>
       </Parameter>
       <Parameter>
          <Name>lat_iau_sun</Name>
          <ParameterKey>juno_cruise_lat</ParameterKey>
-         <Description/><Ucd/><Units>deg</Units><UnitsConversion/>
+         <Description/>
+         <Ucd/>
+         <Units>deg</Units>
+         <UnitsConversion/>
+         <Support>
+            <SupportQuantity>Positional</SupportQuantity>
+         </Support>
       </Parameter>
    </NumericalData>
 </Spase>
diff --git a/NumericalData/AMDA/Juno/Ephemeris/juno-jupiter-all.xml b/NumericalData/AMDA/Juno/Ephemeris/juno-jupiter-all.xml
index f40674a..b52a9ca 100644
--- a/NumericalData/AMDA/Juno/Ephemeris/juno-jupiter-all.xml
+++ b/NumericalData/AMDA/Juno/Ephemeris/juno-jupiter-all.xml
@@ -6,14 +6,16 @@
       <ResourceHeader>
          <ResourceName>orbit jupiter</ResourceName>
          <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
-         <Description>                        
-         </Description>
-         <Acknowledgement>            
-         </Acknowledgement>
-         <Contact>        
-            <PersonID/>
-            <Role/>
+         <Description/>                                 
+         <Acknowledgement/>                     
+         <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>              
@@ -28,9 +30,7 @@
          <AccessRights>Open</AccessRights>
          <AccessURL>
             <Name>AMDA at CDPP</Name>
-            <URL>
-                http://amda.cdpp.eu
-            </URL>
+            <URL>http://amda.cdpp.eu</URL>
          </AccessURL>
          <Format>Text</Format>
          <Acknowledgement>           
@@ -44,105 +44,157 @@
              <StartDate>2016-06-01T00:00:00Z</StartDate>
              <StopDate>2018-02-20T23:49:59Z</StopDate>
          </TimeSpan>
-      <Cadence>PT1H</Cadence></TemporalDescription>
+      <Cadence>PT300S</Cadence></TemporalDescription>
       <ObservedRegion>Jupiter</ObservedRegion>
-      <Caveats>
-      </Caveats>    
-<Parameter>
-   <Name>xyz_iau_jupiter</Name>
-   <ParameterKey>juno_jup_xyz</ParameterKey>
-   <Description/>
-   <Ucd/>
-   <Units>Rj</Units>
-   <UnitsConversion/>
-   <Structure>
-      <Size>3</Size>
-      <Element>
-         <Name>x</Name>
-         <Qualifier/>
-      <Index/>
-         <ParameterKey>juno_jup_xyz(0)</ParameterKey>
-         <ValidMin/>
-         <ValidMax/>
-         <FillValue/>
-   </Element>
-      <Element>
-         <Name>y</Name><Qualifier/><Index/>
-         <ParameterKey>juno_jup_xyz(1)</ParameterKey>
-         <ValidMin/><ValidMax/><FillValue/>
-      </Element>
-      <Element>
-         <Name>z</Name>
-         <Qualifier/><Index/>
-         <ParameterKey>juno_jup_xyz(2)</ParameterKey>
-         <ValidMin/>
-         <ValidMax/>
-         <FillValue/>
-      </Element>
-   </Structure>
-</Parameter>
-      <Parameter><Name>distance juno-jup</Name>
+      <Caveats/>          
+      <Parameter>
+         <Name>xyz_iau_jupiter</Name>
+         <ParameterKey>juno_jup_xyz</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units>Rj</Units>
+         <UnitsConversion/>
+         <Structure>
+            <Size>3</Size>
+            <Element>
+               <Name>x</Name>
+               <Qualifier>Component.I</Qualifier>
+               <Index>1</Index>
+               <ParameterKey>juno_jup_xyz(0)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+            <Element>
+               <Name>y</Name>
+               <Qualifier>Component.J</Qualifier>
+               <Index>2</Index>
+               <ParameterKey>juno_jup_xyz(1)</ParameterKey>
+               <ValidMin/><ValidMax/><FillValue/>
+            </Element>
+            <Element>
+               <Name>z</Name>
+               <Qualifier>Component.K</Qualifier>
+               <Index>3</Index>
+               <ParameterKey>juno_jup_xyz(2)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+         </Structure>
+         <Support>
+            <SupportQuantity>Positional</SupportQuantity>
+         </Support>
+      </Parameter>
+      <Parameter>
+         <Name>distance juno-jup</Name>
          <ParameterKey>juno_jup_r</ParameterKey>
          <Description/><Ucd/>
-         <Units>Rj</Units><UnitsConversion/>
+         <Units>Rj</Units>
+         <UnitsConversion/>
+         <Support>
+            <SupportQuantity>Positional</SupportQuantity>
+         </Support>
       </Parameter>
       <Parameter>
          <Name>lon_iau_jupiter</Name>
          <ParameterKey>juno_jup_lon</ParameterKey>
          <Description/>
-         <Ucd/><Units>deg</Units><UnitsConversion/>
+         <Ucd/>
+         <Units>deg</Units>
+         <UnitsConversion/>
+         <Support>
+            <SupportQuantity>Positional</SupportQuantity>
+         </Support>
       </Parameter>
       <Parameter><Name>lat_iau_jupiter</Name>
          <ParameterKey>juno_jup_lat</ParameterKey>
-         <Description/><Ucd/><Units>deg</Units>
+         <Description/>
+         <Ucd/>
+         <Units>deg</Units>
          <UnitsConversion/>
+         <Support>
+            <SupportQuantity>Positional</SupportQuantity>
+         </Support>
       </Parameter>
       <Parameter>
          <Name>xyz_jsm</Name><ParameterKey>juno_jup_jsm</ParameterKey>
          <Description/><Ucd/><Units>Rj</Units>
          <UnitsConversion/>
-         <Structure><Size>3</Size><Element>
-            <Name>x</Name><Qualifier/><Index/>
-            <ParameterKey>juno_jup_jsm(0)</ParameterKey>
-            <ValidMin/><ValidMax/><FillValue/>
-         </Element>
-            <Element><Name>y</Name><Qualifier/>
-            <Index/><ParameterKey>juno_jup_jsm(1)</ParameterKey>
-            <ValidMin/><ValidMax/>
-            <FillValue/>
-         </Element>
-            <Element><Name>z</Name>
-            <Qualifier/><Index/>
+         <Structure>
+            <Size>3</Size>
+            <Element>
+               <Name>x</Name>
+               <Qualifier>Component.I</Qualifier>
+               <Index>1</Index>
+               <ParameterKey>juno_jup_jsm(0)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+            <Element>
+               <Name>y</Name>
+               <Qualifier>Component.J</Qualifier>
+               <Index>2</Index>
+               <ParameterKey>juno_jup_jsm(1)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+            <Element>
+               <Name>z</Name>
+               <Qualifier>Component.K</Qualifier>
+               <Index>3</Index>
                <ParameterKey>juno_jup_jsm(2)</ParameterKey>
-               <ValidMin/><ValidMax/><FillValue/>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
             </Element>
          </Structure>
+         <Support>
+            <SupportQuantity>Positional</SupportQuantity>
+         </Support>
       </Parameter>
       <Parameter>
          <Name>xyz_jso</Name>
          <ParameterKey>juno_jup_jso</ParameterKey>
-         <Description/><Ucd/><Units>Rj</Units>
-         <UnitsConversion/><Structure>
-            <Size>3</Size><Element>
+         <Description/>
+         <Ucd/>
+         <Units>Rj</Units>
+         <UnitsConversion/>
+         <Structure>
+            <Size>3</Size>
+            <Element>
                <Name>x</Name>
-               <Qualifier/>
-               <Index/>
+               <Qualifier>Component.I</Qualifier>
+               <Index>1</Index>
                <ParameterKey>juno_jup_js0(0)</ParameterKey>
-               <ValidMin/><ValidMax/><FillValue/></Element>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
             <Element>
                <Name>y</Name>
-               <Qualifier/>
-               <Index/>
+               <Qualifier>Component.J</Qualifier>
+               <Index>2</Index>
                <ParameterKey>juno_jup_js0(1)</ParameterKey>
-               <ValidMin/><ValidMax/><FillValue/>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
             </Element>
             <Element>
                <Name>z</Name>
-               <Qualifier/>
-               <Index/><ParameterKey>juno_jup_js0(2)</ParameterKey>
-               <ValidMin/><ValidMax/><FillValue/>
+               <Qualifier>Component.K</Qualifier>
+               <Index>3</Index>
+               <ParameterKey>juno_jup_js0(2)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
             </Element>
          </Structure>
+         <Support>
+            <SupportQuantity>Positional</SupportQuantity>
+         </Support>
       </Parameter>
    </NumericalData>
 </Spase>
--
libgit2 0.21.2